From shedges at users.sourceforge.net  Sun Jan  2 15:12:42 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 02 Jan 2005 06:12:42 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,NONE,1.1
Message-ID: <E1Cl6TK-0003qX-KF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14771

Added Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Load original version

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Installing Koha 2.2 on Fedora Core (1, 2, 3)</title>

  <articleinfo>
    <pubdate>2005-01-03</pubdate>

    <author>
      <firstname>Joshua</firstname>

      <surname>Ferraro</surname>
    </author>

    <revhistory>
      <revision>
        <revnumber>2.2.0</revnumber>

        <date>2004-12-23</date>

        <revdescription>
          <para>Changes made by Joshua Ferraro. Original Document</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Using this document</title>

    <section>
      <title id="copyright">Copyright and License</title>

      <para>Copyright 2004, 2005 Joshua Ferraro <email>jmf (at)
      kados.org</email></para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).
      Koha-related documents may be reproduced and distributed in whole or in
      part, in any medium physical or electronic, as long as this copyright
      notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you: <orderedlist>
          <listitem>
            <para>License the derivative work with this same license, or the
            Linux Documentation Project License (<ulink
            url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
            Include a copyright notice and at least a pointer to the license
            used.</para>
          </listitem>

          <listitem>
            <para>Give due credit to previous authors and major
            contributors.</para>
          </listitem>
        </orderedlist></para>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>
    </section>

    <section>
      <title id="disclaimer">Disclaimer</title>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </section>
  </section>

  <section>
    <title>Introduction</title>

    <section>
      <title>Prior Knowledge and Assumptions</title>

      <para>In this document I assume that you are running a standard
      installation of <application>Fedora Core</application> (1, 2, or 3). If
      you need help setting up <application>Fedora Core</application> on your
      machine please see the Fedora installation manual available from <ulink
      url="http://fedora.redhat.com">http://fedora.redhat.com</ulink>. I would
      highly recommend using the latest release of <application>Fedora
      Core</application> as the shelf-life of these distributions is only
      about 12 months. If you need a longer shelf life for your
      <application>Koha</application> machines I recommend either
      <application>Red Hat Enterprise Linux</application> (AS or ES) or a
      distro like <application>Debian</application> which does not charge for
      a subscription service and has a much longer shelf life. If, like me,
      you expect that you will be upgrading your
      <application>Koha</application> installation every 6 months or so the
      <application>Fedora Core</application> series are a good choice.</para>

      <para>For more information about <application>Fedora Core</application>
      see the release notes for the distro you have chosen:</para>

      <variablelist>
        <varlistentry>
          <term>Core 1:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 2:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 3:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.htm</ulink>l</para>
          </listitem>
        </varlistentry>
      </variablelist>

      <para>If you already have some knowledge about
      <application>Linux</application> or other Unices it will be easier to
      understand this manual, however, no intermediate steps are necessary
      subsequent to the installation of <application>Fedora Core</application>
      before beginning the <application>Koha</application> installation. This
      guide is a "cookbook" for installing dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>.</para>
    </section>

    <section>
      <title>Internet Connection</title>

      <para>This guide assumes that the <application>Koha</application> server
      has a dedicated Internet connection -- a high-speed connection is best.
      It is possible to install <application>Koha</application> without a
      dedicated Internet connection, but this guide does not go into how to do
      that.</para>
    </section>

    <section>
      <title>Package Group Selections</title>

      <para>During a CD installation of <application>Fedora Core</application>
      you have the option of selecting "Package Groups" for installation --
      you can also access this utility after installation.<tip>
          <para>It can be found from the "hat" menu under <userinput>System
          Settings --&gt; Add/Remove Applications</userinput></para>
        </tip></para>

      <para>You'll want to install the following package groups:</para>

      <itemizedlist>
        <listitem>
          <para>Web Server</para>
        </listitem>

        <listitem>
          <para>MySQL Database<note>
              <para>Careful, Core 1 and 2 hide this option ... use the
              <userinput>Details</userinput> button to select
              <application>MySQL</application> and de-select
              <application>PostgreSQL</application></para>
            </note></para>
        </listitem>

        <listitem>
          <para>Development Tools</para>
        </listitem>

        <listitem>
          <para>Administration Tools (optional but a good idea)</para>
        </listitem>

        <listitem>
          <para>System Tools (optional but a good idea)</para>
        </listitem>
      </itemizedlist>

      <para>I don't generally recommend installing "Everything". Mainly this
      is because the more applications you have installed and running on your
      system the more complex the maintenance becomes. Running unused
      applications may also open up your system to attacks that would
      otherwise not be an issue.</para>
    </section>

    <section>
      <title>Firewall Configuration</title>

      <para>I would highly recommend utilizing the default firewall features
      that come with <application>Fedora Core</application>. However, you'll
      want to allow access to <command>http/https</command> (port 80 and 8080)
      as well as <command>ssh</command> (port 22). You can configure the
      firewall during the initial install or subsequently using the "Security
      Level" utility in the "hat" menu.</para>
    </section>

    <section>
      <title>A Note On The Graphical User Interface (GUI)</title>

      <para><application>Fedora Core</application> will always default to
      installing and loading your GUI (by default this is
      <application>X.org</application> and <application>Gnome</application>).
      In the past I have always disabled installation of the GUI on a
      production server, but lately I've taken to installing it and then
      tweaking the startup procedures so that the GUI does not load by default
      but must be started manually (so during normal operations the GUI does
      not waste precious resources). This is mainly because I find some of the
      GUI tools to be quite useful when I'm physically on-location and working
      on a server. To disable the GUI subsequent to installation simply edit
      <filename>/etc/inittab</filename> and make the default runlevel 3
      instead of 5. To start the GUI afterwards type
      <userinput>startx</userinput> at the command prompt.</para>

      <para>If the machine on which you will install
      <application>Koha</application> is nearby you can log in locally to
      perform the <application>Koha</application> install. But most folks find
      it more convenient to log in remotely using an <command>SSH</command> or
      a <command>Telnet</command> client. If you are running
      <application>Windows</application> you can start
      <command>Telnet</command> by clicking
      <userinput>Start-&gt;Run</userinput> from the start menu and typing
      <userinput>telnet</userinput>. Or you can download the free
      <command>SSH</command> program <command>PuTTy</command> from <ulink
      url="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html</ulink>.
      <command>SSH</command> is a more secure and robust terminal emulator
      standard and is a better choice.</para>

      <para>For many of the commands it will be necessary to have superuser
      privileges on the <application>Koha</application> server. However, it's
      generally not a good idea to log into your server directly as the root
      user. It's better to use the <command>su</command> utility to allow your
      regular user to obtain superuser privileges. For example,<literallayout>jmf at koha:~$ su
password:
koha:/home/jmf#</literallayout>The <prompt>#</prompt> tells you that you have
      root privileges. If you want to return to your regular user type
      <userinput>exit</userinput>.</para>
    </section>

    <section>
      <title>Update Your System</title>

      <para><application>Fedora Core</application> has a rapid development
      pace. There are usually daily updates or bugfixes to applications in the
      system. Be sure your installation is up-to-date. You can install updates
      either using the <command>up2date</command> application (or it's GUI
      equivalent) or by using the new tool <command>yum</command>. To install
      updates using <command>yum</command> type:<literallayout>[root at koha]# yum update</literallayout></para>

      <para>You can also use <command>yum</command> to install programs that
      have been packaged for <application>Fedora Core</application>. See the
      <command>yum</command> <command>man</command> page for more
      information.</para>
    </section>
  </section>

  <section>
    <title>Dependencies</title>

    <para><application>Koha</application> is built with a number of related
    open source web-based technologies which are sometimes designated with the
    acronym L.A.M.P. L.A.M.P. refers to <application>Linux</application> (the
    GNU/Linux operating system), <application>Apache</application> (a robust
    web server application), <application>MySQL</application> (a Relational
    Database Management System using the SQL standard) and Perl/Python/PHP
    (three common scripting languages). <application>Koha</application> was
    originally designed for a GNU/Linux system running
    <application>Apache</application> and <application>MySQL</application> and
    is written almost entirely in <application>Perl</application>. In order to
    install and use <application>Koha</application> it is necessary first to
    install and configure these dependencies.</para>

    <section>
      <title>Perl</title>

      <para>The majority of <application>Koha</application> is written in
      <application>Perl</application> -- a high-level programming or scripting
      language. <application>Perl</application>'s functionality and usefulness
      has been extended and enhanced through the development and free
      distribution of modules (programming libraries) within the
      <application>Perl</application> community. The vast majority of these
      modules are available through the Perl Network
      <emphasis>CPAN</emphasis>. Others are available for download from the
      module developer's website or <command>ftp</command> server. Some of
      these modules have also been packaged directly into <application>Fedora
      Core</application>'s packaging system.</para>

      <para><application>Koha</application> relies on several of these
      extended module libraries for its functions and getting all of these
      modules set up can be the most challenging part of the
      <application>Koha</application> installation.
      <application>Perl</application> itself is installed by default on a
      <application>Fedora Core</application> system so you needn't install it.
      The extended <application>Perl</application> modules that are not
      available via <application>Fedora Core</application>'s packaging system
      are available on the Perl Network <command>CPAN</command>.
      <application>Perl</application> has a utility that can be run to
      automatically install modules from <command>CPAN</command> and it's
      pretty good about keeping track of dependencies within
      <application>Perl</application> itself, but it cannot handle
      dependencies outside the <application>Perl</application> base. So before
      we can install these modules we need to install their dependencies which
      are outside of <application>Perl</application>.</para>

      <section>
        <title>Configuring Perl's CPAN utility while installing
        MARC::Record</title>

        <para>The first time you use <application>Perl</application>'s
        <command>CPAN</command> utility it will configure itself. So we can
        start that process by telling <application>Perl</application> to
        install the <filename>MARC::Record</filename> module from the
        <command>CPAN</command> network:<literallayout>koha:/# perl -MCPAN -e 'install "MARC::Record"'</literallayout>You
        should get the following message:<literallayout>/usr/share/perl/5.6.1/CPAN/Config.pm initialized.

CPAN is the world-wide archive of perl resources. It 
consists of about 100 sites that all replicate the same
contents all around the globe.  Many countries have at
least one CPAN site already. The resources found on CPAN
are easily accessible with the CPAN.pm module. If you want
to use CPAN.pm, you have to configure it properly.

If you do not want to enter a dialog now, you can answer
'no' to this question and I'll try to autoconfigure. (Note:
you can revisit this dialog anytime later by typing 'o conf
init' at the cpan prompt.)

Are you ready for manual configuration? [yes]</literallayout></para>

        <para>The setup process will take a while. It should be safe to answer
        all the questions with the default answers. You can safely ignore the
        utilities' attempts to get you to upgrade or install other
        <application>Perl</application> modules but you should allow it to
        prepend prerequisites. You can also set it to automatically build
        <application>Perl</application> prerequisites without asking by typing
        <userinput>follow</userinput> at the following prompt:<literallayout>The CPAN module can detect when a module that which you are
trying to build depends on prerequisites. If this happens,
it can build the prerequisites for you automatically
('follow'), ask you for confirmation ('ask'), or just
ignore them ('ignore'). Please set your policy to one of
the three values.

Policy on building prerequisites (follow, ask or ignore)? 
[ask]</literallayout>Eventually you may get the following
        message:<literallayout>Now we need to know where your favorite CPAN sites are located. Push
a few sites onto the array (just in case the first on the array won't
work). If you are mirroring CPAN to your local workstation, specify a
file: URL.

First, pick a nearby continent and country (you can pick several of
each, separated by spaces, or none if you just want to keep your
existing selections). Then, you will be presented with a list of URLs
of CPAN mirrors in the countries you selected, along with previously
selected URLs. Select some of those URLs, or just keep the old list.
Finally, you will be prompted for any extra URLs -- file:, ftp:, or
http: -- that host a CPAN mirror.

(1) Africa
(2) Asia
(3) Central America
(4) Europe
(5) North America
(6) Oceania
(7) South America
Select your continent (or several nearby continents) []</literallayout>Proceed
        by selecting the numeric value for your location. You may be prompted
        for a more specific location and finally you will be able to select
        several URLs for <command>CPAN</command> to use to download your
        modules from. It's a good idea to select a few just in case some of
        them are not operational or are slow.</para>
      </section>

      <section>
        <title>The Yaz Toolkit</title>

        <para>As long as everything went smoothly with the
        <command>CPAN</command> installation, <application>Perl</application>
        should finish the install and return you to the command prompt. We're
        almost ready to install the remaining <application>Perl</application>
        modules but one of them, namely <filename>Net::Z3950</filename>, has a
        non-Perl dependency that we need to install first called
        <application>Yaz</application>.</para>

        <para>As of this writing Indexdata, who wrote and maintains the
        <application>Yaz</application> toolkit has made packages available for
        <application>Fedora Core</application> 2 and 3. These can be
        downloaded from their <command>ftp</command> site: <ulink
        url="http://ftp.indexdata.dk/pub/yaz/redhat/">http://ftp.indexdata.dk/pub/yaz/redhat/</ulink>.
        You'll need the <filename>yaz</filename>, <filename>libyaz</filename>
        and <filename>libyaz-devel</filename> packages (the latest version
        should be fine and if you don't find a package for your specific
        version of <application>Fedora Core</application> a previous version
        should work). Navigate to a convenient spot and type:<literallayout>[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/yaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-devel-2.0.28-1.i386.rpm</literallayout></para>

        <para>Now you should have three rpms that can be installed with the
        <command>rpm</command> utility thusly:<literallayout>[root at koha]# rpm -i yaz*
[root at koha]# rpm -i libyaz*</literallayout>(the * is a wildcard).</para>
      </section>

      <section>
        <title>Installing the Remaining Perl Modules</title>

        <para>At this point we can install the other
        <application>Perl</application> modules:<literallayout>[root at koha]# perl -MCPAN -e 'install Event'
[root at koha]# perl -MCPAN -e 'install Net::Z3950'
[root at koha]# perl -MCPAN -e 'install Digest::MD5'
[root at koha]# perl -MCPAN -e 'install "HTML::Template"'
[root at koha]# perl -MCPAN -e 'install "Mail::Sendmail"'
[root at koha]# perl -MCPAN -e 'install "PDF::API2"'</literallayout></para>

        <para>That should take care of the <application>Perl</application>
        installation and configuration as well as all the modules. If we left
        any <application>Perl</application> modules out
        <application>Koha</application> will warn us when we run the install
        script and will give instructions on how to install them.</para>
      </section>
    </section>

    <section>
      <title>MySQL</title>

      <para>For a database <application>Koha</application> uses
      <application>MySQL</application> — a free SQL-query-based Relational
      Database Management System. The installation and basic configuration of
      <application>MySQL</application> on a Debian system is quite simple.
      More advanced topics such as database optimization and
      <application>MySQL</application> administration are documented online at
      <ulink
      url="http://www.mysql.com/doc/en/index.html">http://www.mysql.com/doc/en/index.html</ulink>.
      It would be well worth your while to familiarize yourself with the basic
      functionality and behaviour that you can expect from
      <application>MySQL</application>. Chapter 5, <citetitle>Database
      Administration</citetitle>, is especially relevant for using
      <application>Koha</application>.</para>

      <para>To install the <application>MySQL</application> server on your
      <application>Fedora Core</application> machine type:<literallayout>[root at koha]# yum install mysql-server</literallayout>After
      installing <application>MySQL</application> you will need to start it by
      typing:<literallayout>[root at koha]# /etc/init.d/mysqld start</literallayout></para>

      <para>Note that If <application>MySQL</application> fails to start you
      may need to adjust selinux. To do that type the
      following:<literallayout>[root at koha ~]# setenforce 0
[root at koha ~]# mysql_install_db
Preparing db table
Preparing host table
Preparing user table
Preparing func table
Preparing tables_priv table
Preparing columns_priv table
Installing all prepared tables
041201 17:07:25  /usr/libexec/mysqld: Shutdown Complete

To start mysqld at boot time you have to copy support-files/mysql.server
to the right place for your system

PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !
This is done with:
/usr/bin/mysqladmin -u root  password 'new-password'
/usr/bin/mysqladmin -u root -h koha.athenscounty.lib.oh.us  password 'new-password'
See the manual for more instructions.

You can start the MySQL daemon with:
cd /usr ; /usr/bin/safe_mysqld &amp;

You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:
cd sql-bench ; run-all-tests

Please report any problems with the /usr/bin/mysqlbug script!

The latest information about MySQL is available on the web at
http://www.mysql.com
Support MySQL by buying support/licenses at https://order.mysql.com

[root at koha ~]# setenforce 1</literallayout>Then start up
      <application>MySQL</application> again and you should be good to
      go.</para>

      <para>It's a good idea to set the <application>MySQL</application>
      administrator password right away. You will need to have this password
      handy later in the installation so make sure you write it down. You can
      set the password from the command line thusly:<literallayout>[root at koha]# mysqladmin password [type your new password here]</literallayout>but
      leave out the brackets.</para>
    </section>

    <section>
      <title>Apache</title>

      <para>According to the <application>Apache</application> website,
      <application>Apache</application> has been the most popular web server
      on the Internet since April of 1996. Additionally, the October 2003
      <citetitle>Netcraft Web Server Survey</citetitle> found that over 64% of
      websites on the Internet use <application>Apache</application>, making
      it more popular than all other web servers combined. You can see the
      survey at <ulink
      url="http://news.netcraft.com/">http://news.netcraft.com/</ulink>.
      Additionally, you can find out more about the Apache Software Foundation
      on their website at <ulink
      url="http://www.apache.org/">http://www.apache.org/</ulink>.</para>

      <para>We will have to configure <application>Apache</application> for
      <application>Koha</application> later on in the install, but for now you
      should know that <application>Apache</application>'s configuration files
      are kept in <filename>/etc/httpd/conf/httpd.conf</filename> and
      <application>Apache</application>'s log files are in
      <filename>/var/log/httpd</filename>.</para>
    </section>

    <section>
      <title>Conclusion</title>

      <para>Well, that's it, we've installed all the dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>. Now you are ready to download
      <application>Koha</application> from <ulink
      url="http://www.koha.org">http://www.koha.org</ulink> and install it
      following the directions in the <filename>INSTALL</filename>
      file.</para>
    </section>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jan  3 11:48:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:40 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.113,1.114 SearchMarc.pm,1.35,1.36
Message-ID: <E1ClPlQ-0005NA-8H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/C4

Modified Files:
	Biblio.pm SearchMarc.pm 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** Biblio.pm	10 Dec 2004 16:27:53 -0000	1.113
--- Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
***************
*** 254,258 ****
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
--- 254,258 ----
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
***************
*** 266,269 ****
--- 266,270 ----
      my $hidden;
      my $isurl;
+ 	my $link;
  
      while (
***************
*** 271,275 ****
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl )
          = $sth->fetchrow
        )
--- 272,276 ----
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl,			$link )
          = $sth->fetchrow
        )
***************
*** 286,289 ****
--- 287,291 ----
          $res->{$tag}->{$subfield}->{hidden}           = $hidden;
          $res->{$tag}->{$subfield}->{isurl}            = $isurl;
+         $res->{$tag}->{$subfield}->{link}            = $link;
      }
      return $res;
***************
*** 2633,2636 ****
--- 2635,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.114  2005/01/03 10:48:33  tipaul
+ # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
+ # * partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
+ #
  # Revision 1.113  2004/12/10 16:27:53  tipaul
  # limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items)

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** SearchMarc.pm	10 Dec 2004 16:27:53 -0000	1.35
--- SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
***************
*** 167,170 ****
--- 167,171 ----
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
+ 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 191,198 ****
  	
  	#last minute stripping out of ' and ,
! 	foreach $_ (@$value) {
! 	$_=~ s/\'/ /g;
! 	$_=~ s/\,/ /g;
! 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
--- 192,200 ----
  	
  	#last minute stripping out of ' and ,
! # paul : quoting, it's done a few lines lated.
! # 	foreach $_ (@$value) {
! # 		$_=~ s/\'/ /g;
! # 		$_=~ s/\,/ /g;
! # 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
***************
*** 202,206 ****
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
  		if(@$excluding[$i])	# NOT statements
  		{
--- 204,208 ----
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g if @$operator[$i] eq "contains";
  		if(@$excluding[$i])	# NOT statements
  		{




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.37,1.38
Message-ID: <E1ClPlV-0005Na-SU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** marc_subfields_structure.tmpl	4 Oct 2004 20:52:11 -0000	1.37
--- marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
***************
*** 137,140 ****
--- 137,141 ----
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
  	</td>




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.29,1.30
Message-ID: <E1ClPlV-0005NZ-Sn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** MARCdetail.tmpl	22 Dec 2004 10:14:43 -0000	1.29
--- MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
***************
*** 86,91 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 86,95 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 112,117 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 116,125 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 138,143 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 146,155 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 164,169 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 176,185 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 190,195 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 206,215 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 216,221 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 236,245 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 242,247 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 266,275 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 268,273 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 296,305 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 294,299 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 326,335 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 320,325 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 356,365 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.50,1.51
Message-ID: <E1ClPvE-0005nw-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/C4

Modified Files:
	Output.pm 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** Output.pm	5 Aug 2004 16:35:25 -0000	1.50
--- Output.pm	3 Jan 2005 10:58:46 -0000	1.51
***************
*** 74,78 ****
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
--- 74,78 ----
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 	my $opacstylesheet = C4::Context->preference('opacstylesheet');
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
***************
*** 83,86 ****
--- 83,87 ----
  							interface => ($opac ne 'intranet'? '/opac-tmpl': '/intranet-tmpl'),
  							theme => $theme,
+ 							opacstylesheet => $opacstylesheet,
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.7,1.8
Message-ID: <E1ClPvE-0005nx-L5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac-top.inc 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-top.inc	24 Nov 2004 16:08:55 -0000	1.7
--- opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
***************
*** 4,8 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 4,12 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
***************
*** 20,24 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 24,28 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Mon Jan  3 12:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:08:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.16,1.17 marc-editor.css,1.3,NONE
Message-ID: <E1ClQ4k-0006CP-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23824/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac.css 
Removed Files:
	marc-editor.css 
Log Message:
merging opac.css and marc-editor.css, that is used in MARC view.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac.css	15 Dec 2004 16:03:55 -0000	1.16
--- opac.css	3 Jan 2005 11:08:36 -0000	1.17
***************
*** 355,357 ****
  	padding-left:8pt;
  	float:left;
! }
\ No newline at end of file
--- 355,403 ----
  	padding-left:8pt;
  	float:left;
! }
! 
! /* for MARC view  */
! div.tabs {
! 	width:10px;
! 	position:absolute;
! 	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
! }
! 
! div.tabs a {
! 	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
! }
! 
! div.tab {
! 	background-color: #ACE6E6;
! 	display: block;
! 	visibility:hidden;
! 	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
! }
! td {
! 	border:0px;
! }
! 
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: thin solid #FF6600;
! 	margin-right:30%;
! }
! 
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
! }

--- marc-editor.css DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:36 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.2,1.3
Message-ID: <E1ClQ5g-0006Ev-Gn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/opac

Modified Files:
	opac-shelves.pl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.pl	12 Nov 2004 16:27:33 -0000	1.2
--- opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
--- 34,47 ----
  my $env;
  my $query = new CGI;
+ my $headerbackgroundcolor='#663266';
+ my $circbackgroundcolor='#555555';
+ my $circbackgroundcolor='#550000';
+ my $linecolor1='#bbbbbb';
+ my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
***************
*** 58,80 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					     LibraryName => C4::Context->preference("LibraryName"),
! 					});
  SWITCH: {
! 	if ($query->param('viewshelf')) {  viewshelf($query->param('viewshelf')); last SWITCH;}
! 	if ($query->param('shelves')) {  shelves(); last SWITCH;}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color=1;
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}= 1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
  ;
  		push (@shelvesloop, \%line);
--- 63,108 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
! 	if ($query->param('op') eq 'modifsave') {
! 		ModifShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
! 		last SWITCH;
! 	}
! 	if ($query->param('op') eq 'modif') {
! 		my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($query->param('shelf'));
! 		$template->param(edit => 1,
! 						shelfnumber => $shelfnumber,
! 						shelfname => $shelfname,
! 						"category$category" => 1);
! # 		editshelf($query->param('shelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('viewshelf')) {
! 		viewshelf($query->param('viewshelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('shelves')) {
! 		shelves();
! 		last SWITCH;
! 	}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color='';
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}= $color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
+ 		$line{"category".$shelflist->{$element}->{'category'}} = 1;
+ 		$line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq $loggedinuser;
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
+ 		$line{'firstname'}=$shelflist->{$element}->{'firstname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ 		$line{'surname'}=$shelflist->{$element}->{'surname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
  ;
  		push (@shelvesloop, \%line);
***************
*** 84,87 ****
--- 112,123 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
+ # sub editshelf {
+ # 	my ($shelfnumber) = @_;
+ # 	my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($shelfnumber);
+ # 	$template->param(edit => 1,
+ # 					shelfnumber => $shelfnumber,
+ # 					shelfname => $shelfname,
+ # 					"category$category" => 1);
+ # }
  sub shelves {
  	if (my $newshelf=$query->param('addshelf')) {
***************
*** 107,116 ****
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color=1;
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
--- 143,152 ----
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color='';
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
***************
*** 129,143 ****
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color=1;
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{'biblionumber'} = $item->{'biblionumber'};
  		push(@itemsloop, \%line);
  	}
--- 165,179 ----
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color='';
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
  	}
***************
*** 152,160 ****
  #
  # $Log$
! # Revision 1.2  2004/11/12 16:27:33  tipaul
! # fixes for printing a biblio
  #
! # Revision 1.1  2004/03/15 15:02:19  tipaul
! # adding virtual shelves to opac
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul
--- 188,209 ----
  #
  # $Log$
! # Revision 1.3  2005/01/03 11:09:34  tipaul
! # synch'ing virtual shelves management in opac with the librarian one, that has more features
! #
! # Revision 1.5  2004/12/16 11:30:57  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf name & status
! #
! # Revision 1.4  2004/12/15 17:28:23  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf (this being not finished, will commit the rest soon)
! #
! # Revision 1.3  2004/12/02 16:38:50  tipaul
! # improvement in book shelves
  #
! # Revision 1.2  2004/11/19 16:31:30  tipaul
! # bugfix for bookshelves not in official CVS
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-detail.tmpl,1.14,1.15 opac-ISBDdetail.tmpl,1.3,1.4 opac-main.tmpl,1.15,1.16 opac-MARCdetail.tmpl,1.4,1.5 opac-shelves.tmpl,1.1,1.2
Message-ID: <E1ClQ5h-0006F5-HJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl opac-ISBDdetail.tmpl opac-main.tmpl 
	opac-MARCdetail.tmpl opac-shelves.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.tmpl	22 Nov 2004 16:18:11 -0000	1.14
--- opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
***************
*** 3,11 ****
  
  <div id="bibliomenu">
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,17 ----
  
  <div id="bibliomenu">
+ 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+ 		Simple
+ 	</a>
+ 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
+ 		Complete
+ 	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-ISBDdetail.tmpl	28 Nov 2004 08:58:04 -0000	1.3
--- opac-ISBDdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.4
***************
*** 3,10 ****
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,16 ----
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
***************
*** 16,19 ****
--- 22,31 ----
  		</a>
  	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
+ 	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-main.tmpl	8 Dec 2004 10:26:32 -0000	1.15
--- opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
***************
*** 4,14 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
- 	<style type="text/css">
- 	input {
- 		background-color: #ACE6E6;
- 	}
- 	</style>
  </head>
  
--- 4,13 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
  

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-MARCdetail.tmpl	12 Nov 2004 16:28:10 -0000	1.4
--- opac-MARCdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.5
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
- <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_IF NAME="norequests" -->
! 	<!-- TMPL_ELSE -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
  	<!-- /TMPL_IF -->
  </div>
  
--- 1,30 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
+ 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+ 		Add to shelf
+ 	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
+ 	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
  	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-shelves.tmpl	15 Mar 2004 15:01:49 -0000	1.1
--- opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
***************
*** 2,160 ****
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
!     <table>
!     		<tr>
! 			<th colspan=4>
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
! 		</tr>
! 		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
! 					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="button">Shelf list</a>
! 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type=hidden name=modifyshelfcontents value=1>
! 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<!-- TMPL_IF name="manageshelf" -->
! 		<input type=submit value="Remove Selected Items" class="button">
  	<!-- /TMPL_IF -->
- </form>
- <!-- TMPL_IF name="manageshelf" -->
- <form>
- 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<input type=hidden name=modifyshelfcontents value=1>
- 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<table>
- 		<tr>
- 			<td>
- 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
- 			</td>
- 			<td>
- 				<input name="addbarcode">
- 				<input type=hidden name=modifyshelfcontents value=1>
- 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 				<input type="submit" value="Save" class="button">
- 			</td>
- 		</tr>
- 	</table>
- </form>
- <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<center>
! 		<h1>Bookshelves</h1>
! 		<table border=0 cellpadding=7>
! 			<tr>
! 				<td align=center valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="button">Shelf list</a>
! 						</p>
! 					</form>
! 				</td>
! 				<td align=center valign="bottom">
! 					<form method=post>
! 					<input type="hidden" name="shelves" value=1>
! 					<table border=0 cellpadding=0 cellspacing=0>
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
- 					</table>
  					<p>
! 						<input type=submit value="Delete Shelves" class="button"></form>
  					</p>
- 				</td>
- 				<td align=center valign=bottom>
- 					<form method=post>
- 					<input type=hidden name=shelves value=1>
- 					<table border=0 cellpadding=0 cellspacing=0>
- 						<tr>
- 							<th>
- 								<font color=white>Add Shelf</font>
- 							</th>
- 						</tr>
- 						<tr>
- 							<td>
- 								<p>Name : <input type="text" name="addshelf" size="25"></p>
- 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
- 								<p>Category : <select name="category">
- 									<option value="1">Private</option>
- 									<option value="2">Public</option>
- 									<option value="3">Free</option>
- 									</select>
- 								</p>
- 								<p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
- 									<li> A public can be seen by everybody, but managed only by you.</li>
- 									<li> A free can be managed by any user.</li>
- 								</p>
- 							</td>
- 						</tr>
- 					</table>
- 								<p><input type=submit value="Add New Shelf" class="button"></p>
  					</form>
! 				</td>
! 			</tr>
! 		</table>
  
  	<!-- TMPL_ELSE -->
! 		<center>
! 		<table border=0 cellpadding=4 cellspacing=0>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
--- 2,189 ----
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! 	<form>
! 		<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div>
! 		<h2>Shelf content</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th>delete</th>
! 					<th>barcode</th>
! 					<th>title</th>
! 					<th>Author</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Remove Selected Items" class="button">
! 			<!-- /TMPL_IF -->
! 			<a href="opac-shelves.pl" class="button">Shelf list</a>
! 		</div>
! 	</form>
! 
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
! 		<form>
! 		<h2>Add a book by barcode</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Save" class="button">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1>Bookshelves</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
! 					<h2>Select Shelves to Delete</h2>
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<p>
! 							<label>
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
! 							</label>
! 								<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
! 						</p>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					<p>
! 						<input type="submit" value="Delete Shelves" class="button">
  					</p>
  					</form>
! 		</div>
! 		<div id="bloc60">
! 			<form method="post">
! 				<input type="hidden" name="shelves" value="1">
! 				<h2>Add Shelf</h2>
! 				<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
! 				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
! 				<p><label>Category</label>
! 					<select name="category">
! 						<option value="1">Private</option>
! 						<option value="2">Public</option>
! 						<option value="3">Free</option>
! 					</select>
! 				</p>
! 				<ul> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 					<li> A public can be seen by everybody, but managed only by you.</li>
! 					<li> A free can be managed by any user.</li>
! 				</ul>
! 				<p>
! 					<input type="submit" value="Add New Shelf" class="button">
! 					<a href="opac-shelves.pl" class="button">back to shelf list</a>
! 				</p>
  
+ 			</form>
+ 		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
! 			<h2>Shelf list</h2>
! 			<table class="small">
! 				<tr>
! 					<th>Shelf name</th>
! 					<th>Category</th>
! 					<th>Content size</th>
! 					<th>Modify</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Private
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Public
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Free
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
! 							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc20">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2>Modify shelf</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Name</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Category</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Private</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Private</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Public</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Public</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Free</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Free</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
+ 				<li> A public can be seen by everybody, but managed only by you.</li>
+ 				<li> A free can be managed by any user.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Save" class="button">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jan  3 12:10:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:10:01 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,NONE,1.1
Message-ID: <E1ClQ65-0006GC-Kz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24046/opac

Added Files:
	opac-addbookbybiblionumber.pl 
Log Message:


--- NEW FILE ---
#!/usr/bin/perl
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
# $Header: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1 2005/01/03 11:09:59 tipaul 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::Search;
use C4::Biblio;
use CGI;
use C4::Output;
use C4::BookShelves;
use C4::Circulation::Circ2;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

my $env;
my $query = new CGI;
my $biblionumber = $query->param('biblionumber');
my $shelfnumber = $query->param('shelfnumber');
my $newbookshelf = $query->param('newbookshelf');
my $category = $query->param('category');

my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-addbookbybiblionumber.tmpl",
							query => $query,
							type => "opac",
							authnotrequired => 0,
						});

my $x; # for trash
($x,$x,$shelfnumber) = AddShelf('',$newbookshelf,$loggedinuser,$category) if $newbookshelf;

if ($shelfnumber) {
	&AddToShelfFromBiblio($env, $biblionumber, $shelfnumber);
	print "Content-Type: text/html\n\n<html><body onload=\"window.close()\"></body></html>";
	exit;
} else {

	my  ( $bibliocount, @biblios )  = getbiblio($biblionumber);

	my ($shelflist) = GetShelfList($loggedinuser,3);
	my @shelvesloop;
	my %shelvesloop;
	foreach my $element (sort keys %$shelflist) {
			push (@shelvesloop, $element);
			$shelvesloop{$element} = $shelflist->{$element}->{'shelfname'};
	}

	my $CGIbookshelves=CGI::scrolling_list( -name     => 'shelfnumber',
				-values   => \@shelvesloop,
				-labels   => \%shelvesloop,
				-size     => 1,
				-multiple => 0 );

	$template->param(biblionumber => $biblionumber,
						title => $biblios[0]->{'title'},
						author => $biblios[0]->{'author'},
						CGIbookshelves => $CGIbookshelves,
						);

	output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: opac-addbookbybiblionumber.pl,v $
# Revision 1.1  2005/01/03 11:09:59  tipaul
# *** empty log message ***
#

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Mon Jan  3 12:11:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:11:13 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.86,1.87
Message-ID: <E1ClQ7F-0006Ku-U3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24344/misc

Modified Files:
	Install.pm 
Log Message:
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** Install.pm	15 Dec 2004 14:39:21 -0000	1.86
--- Install.pm	3 Jan 2005 11:11:10 -0000	1.87
***************
*** 1772,1776 ****
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv,lock_tables_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1772,1776 ----
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login




From tipaul at users.sourceforge.net  Mon Jan  3 13:55:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:55:40 -0800
Subject: [Koha-cvs] CVS: koha/misc koha.mysql,1.9,1.10
Message-ID: <E1ClRkK-0002Uw-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9571/misc

Modified Files:
	koha.mysql 
Log Message:
adding an index

Index: koha.mysql
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.mysql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** koha.mysql	12 Nov 2004 16:39:48 -0000	1.9
--- koha.mysql	3 Jan 2005 12:55:22 -0000	1.10
***************
*** 925,929 ****
  # Structure de la table `marc_subfield_structure`
  #
- 
  CREATE TABLE marc_subfield_structure (
    tagfield char(3) NOT NULL default '',
--- 925,928 ----
***************
*** 945,949 ****
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------
--- 944,949 ----
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield),
!   KEY kohafield_2 (kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------




From tipaul at users.sourceforge.net  Mon Jan  3 13:56:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:56:32 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.31,1.32
Message-ID: <E1ClRlA-0002XZ-Op@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9753/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** marc_subfields_structure.pl	8 Dec 2004 10:41:38 -0000	1.31
--- marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
***************
*** 380,383 ****
--- 380,384 ----
  		$row_data{hidden}	= $results->[$i]{'hidden'};
  		$row_data{isurl}	= $results->[$i]{'isurl'};
+ 		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
  		$row_data{bgcolor} = $toggle;




From tipaul at users.sourceforge.net  Mon Jan  3 13:57:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:57:24 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.24,1.25
Message-ID: <E1ClRm0-0002Zh-8A@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9893

Modified Files:
	MARCdetail.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** MARCdetail.pl	22 Dec 2004 10:14:43 -0000	1.24
--- MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
***************
*** 74,78 ****
  
  my $record =MARCgetbiblio($dbh,$bibid);
- warn "=>".$record->as_formatted;
  # open template
  my ($template, $loggedinuser, $cookie)
--- 74,77 ----
***************
*** 96,100 ****
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
--- 95,99 ----
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! # 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
***************
*** 116,119 ****
--- 115,119 ----
  				my %subfield_data;
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
+ 				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";




From tipaul at users.sourceforge.net  Mon Jan  3 13:58:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:58:01 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools - New directory
Message-ID: <E1ClRmb-0002av-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933/misc/migration_tools

Log Message:
Directory /cvsroot/koha/koha/misc/migration_tools added to the repository





From tipaul at users.sourceforge.net  Mon Jan  3 13:59:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:59:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools buildLANG.pl,NONE,1.1
Message-ID: <E1ClRoN-0002fT-Ew@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10247/misc/migration_tools

Added Files:
	buildLANG.pl 
Log Message:
Auto-build LANG authorized values

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
# use MARC::File::USMARC;
# use MARC::Record;
# use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $fields, $number,$language) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$fields,
    'v' => \$verbose,
	'l:s' => \$language,
);

if ($version or !$fields) {
	print <<EOF
Small script to recreate the LANG list in authorised values from existing langs in the catalogue.
This script is useful when you migrate your datas with bulkmarcimport.pl as it populates parameters tables that are not modified by bulkmarcimport.

parameters :
\th : this version/help screen
\ts : the field or field list where the lang codes are stored.
\td : delete every entry of LANG category before doing work.
\tl : the language of the language list (fr or en for instance)

The table is populated with iso codes and meaning (in french).
If the complete language name is unknown, the code is used instead and you will be warned by the script

SAMPLES :
 ./buildLANG -d -s "('101a','101b')"
EOF
;#
exit;
}

my %codesiso;

%codesiso = (
	'eng' => 'english',
	'fre' => 'french'
	);

%codesiso = (
	'mis' => 'diverses',
	'und' => 'inconnue',
	'mul' => 'multilingue',
	'ger' => 'allemand',
	'eng' => 'anglais',
	'ara' => 'arabe',
	'arm' => 'arm�nien',
	'baq' => 'basque',
	'ber' => 'berbere',
	'bre' => 'breton',
	'bul' => 'bulgare',
	'cat' => 'catalan',
	'chi' => 'chinois',
	'cro' => 'croate',
	'dan' => 'danois',
	'spa' => 'espagnol',
	'esp' => 'esp�ranto',
	'fin' => 'finnois',
	'fra' => 'fran�ais ancien',
	'fre' => 'fran�ais',
	'wel' => 'gallois',
	'grc' => 'grec classique',
	'gre' => 'grec moderne',
	'heb' => 'h�breu',
	'hun' => 'hongrois',
	'ita' => 'italien',
	'jap' => 'japonais',
	'lat' => 'latin',
	'dut' => 'n�erlandais',
	'nor' => 'norv�gien',
	'pol' => 'polonais',
	'por' => 'portugais',
	'rum' => 'roumain',
	'rus' => 'russe',
	'ser' => 'serbe',
	'swe' => 'suedois',
	'cze' => 'tch�que',
	'tur' => 'turc',
	'ukr' => 'ukraine',
	'slo' => 'slov�ne',
	'scr' => 'serbo-croate',
	) if $language eq 'fr';

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting lang list\n";
	$dbh->do("delete from authorised_values where category='LANG'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
my $starttime = gettimeofday;

my $sth = $dbh->prepare("SELECT DISTINCT subfieldvalue FROM marc_subfield_table WHERE tag + subfieldcode IN $fields order by subfieldvalue");

$sth->execute;
my $i=1;

print "=========================\n";
my $sth2 = $dbh->prepare("insert into authorised_values (category, authorised_value, lib) values (?,?,?)");
while (my ($langue) = $sth->fetchrow) {
	$sth2->execute('LANG',$langue,$langue?$codesiso{$langue}:$langue);
	print "lang : $langue is unknown is iso list\n" unless $codesiso{$langue};
}
print "=========================\n";




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc bulkmarcimport.pl,1.9,NONE
Message-ID: <E1ClU5g-000225-P0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc

Removed Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- bulkmarcimport.pl DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools bulkmarcimport.pl,NONE,1.1
Message-ID: <E1ClU5g-000220-CS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc/migration_tools

Added Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- NEW FILE ---
#!/usr/bin/perl
# small script that import an iso2709 file into koha 2.0

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $delete, $test_parameter,$char_encoding, $verbose);
GetOptions(
    'file:s'    => \$input_marc_file,
    'n' => \$number,
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'c:s' => \$char_encoding,
    'v:s' => \$verbose,
);

if ($version || ($input_marc_file eq '')) {
	print <<EOF
small script to import an iso2709 file into Koha.
parameters :
\th : this version/help screen
\tfile /path/to/file/to/dump : the file to dump
\tv : verbose mode. 1 means "some infos", 2 means "MARC dumping"
\tn : the number of the record to import. If missing, all the file is imported
\tt : test mode : parses the file, saying what he would do, but doing nothing.
\tc : the char encoding. At the moment, only MARC21 and UNIMARC supported. MARC21 by default.
\d : delete EVERYTHING related to biblio in koha-DB before import  :tables :
\t\tbiblio, \t\tbiblioitems, \t\tsubjects,\titems
\t\tadditionalauthors, \tbibliosubtitles, \tmarc_biblio,
\t\tmarc_subfield_table, \tmarc_word, \t\tmarc_blob_subfield
IMPORTANT : don't use this script before you've entered and checked twice (or more) your  MARC parameters tables.
If you fail this, the import won't work correctly and you will get invalid datas.

SAMPLE : ./bulkmarcimport.pl -file /home/paul/koha.dev/local/npl -n 1
EOF
;#'
die;
}

my $dbh = C4::Context->dbh;

if ($delete) {
	print "deleting biblios\n";
	$dbh->do("delete from biblio");
	$dbh->do("delete from biblioitems");
	$dbh->do("delete from items");
	$dbh->do("delete from bibliosubject");
	$dbh->do("delete from additionalauthors");
	$dbh->do("delete from bibliosubtitle");
	$dbh->do("delete from marc_biblio");
	$dbh->do("delete from marc_subfield_table");
	$dbh->do("delete from marc_word");
	$dbh->do("delete from marc_blob_subfield");
}
if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}

$char_encoding = 'MARC21' unless ($char_encoding);
print "CHAR : $char_encoding\n" if $verbose;
my $starttime = gettimeofday;
my $batch = MARC::Batch->new( 'USMARC', $input_marc_file );
$batch->warnings_off();
$batch->strict_off();
my $i=0;
#1st of all, find item MARC tag.
my ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.itemnumber",'');
# $dbh->do("lock tables biblio write, biblioitems write, items write, marc_biblio write, marc_subfield_table write, marc_blob_subfield write, marc_word write, marc_subfield_structure write, stopwords write");
while ( my $record = $batch->next() ) {
	$i++;
	#now, parse the record, extract the item fields, and store them in somewhere else.

    ## create an empty record object to populate
    my $newRecord = MARC::Record->new();

    # go through each field in the existing record
    foreach my $oldField ( $record->fields() ) {

	# just reproduce tags < 010 in our new record
	if ( $oldField->tag() < 10 ) {
	    $newRecord->append_fields( $oldField );
	    next();
	}

	# store our new subfield data in this list
	my @newSubfields = ();

	# go through each subfield code/data pair
	foreach my $pair ( $oldField->subfields() ) { 
		$pair->[1] =~ s/\<//g;
		$pair->[1] =~ s/\>//g;
		push( @newSubfields, $pair->[0], char_decode($pair->[1],$char_encoding) );
	}

	# add the new field to our new record
	my $newField = MARC::Field->new(
	    $oldField->tag(),
	    $oldField->indicator(1),
	    $oldField->indicator(2),
	    @newSubfields
	);

	$newRecord->append_fields( $newField );

    }


	warn "$i ==>".$newRecord->as_formatted() if $verbose eq 2;
	my @fields = $newRecord->field($tagfield);
	my @items;
	my $nbitems=0;

	foreach my $field (@fields) {
		my $item = MARC::Record->new();
		$item->append_fields($field);
		push @items,$item;
		$newRecord->delete_field($field);
		$nbitems++;
	}
	print "$i : $nbitems items found\n" if $verbose;
	# now, create biblio and items with NEWnewXX call.
	unless ($test_parameter) {
		my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'');
		warn "ADDED biblio NB $bibid in DB\n" if $verbose;
		for (my $i=0;$i<=$#items;$i++) {
			NEWnewitem($dbh,$items[$i],$bibid);
		}
	}
}
# $dbh->do("unlock tables");
my $timeneeded = gettimeofday - $starttime;
print "$i MARC record done in $timeneeded seconds";




From tipaul at users.sourceforge.net  Mon Jan  3 17:12:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:12:31 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator default_intranet_pl_PL.po,1.13,NONE default_opac_pl_PL.po,1.9,NONE
Message-ID: <E1ClUop-0004nJ-Pg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18406

Removed Files:
	default_intranet_pl_PL.po default_opac_pl_PL.po 
Log Message:
removing .po in the wrong place (is in po/ now)

--- default_intranet_pl_PL.po DELETED ---

--- default_opac_pl_PL.po DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 17:30:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:30:16 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,NONE,1.1 translator_doc.txt,1.5,1.6
Message-ID: <E1ClV60-00062S-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23202

Modified Files:
	translator_doc.txt 
Added Files:
	rebuild_lang.sh 
Log Message:
updating doc & adding a script to rebuild officially supported languages

--- NEW FILE ---
#!/bin/sh
./tmpl_process3.pl install -r -s po/css_opac_fr_FR.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/fr
./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr

./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW

./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** translator_doc.txt	30 Dec 2004 06:58:19 -0000	1.5
--- translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
***************
*** 22,27 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,26 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 34,40 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /
!         home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 33,37 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 47,52 ****
   1. Update your translation file:
     
!         ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 44,48 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 54,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
--- 50,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
+  
+ REBUILD ALL
+ ===========
+ The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
+ Useful for developpers, probably useless for all end-users.
+ 
  
  WEAKNESSES
***************
*** 71,74 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 
--- 71,73 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan  4 21:21:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 12:21:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/barcodes barcodes.tmpl,1.3,1.4
Message-ID: <E1ClvAq-0002XW-SF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686/koha-tmpl/intranet-tmpl/default/en/barcodes

Modified Files:
	barcodes.tmpl 
Log Message:
Corrections to English and minor corrections to HTML

Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** barcodes.tmpl	19 Oct 2004 11:50:18 -0000	1.3
--- barcodes.tmpl	4 Jan 2005 20:20:52 -0000	1.4
***************
*** 1,186 ****
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div class="countryPanel" style="position:absolute" id="addCountryCode">

!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">

! 		<input type="hidden" name="addCode" value="1">

! 		<table style="background-color:#EFEFEF;border:1px" align="center">

! 			<tr>

! 				<th colspan="2">

! 					Add a new Country Code

! 				</th>

! 			</tr>

! 			<tr>

! 				<td>

! 					Country Name&nbsp<input type="text" size="10" id="countryName" name="countryName"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 				<td>

! 					Country Code&nbsp<input type="text" size="3" id="countryCode" name="countryCode"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 			</tr>

! 			<tr>

! 				<td align="right">

! 					<input type="submit" name="submit" id="submit" value="Save Code"/>

! 				</td>

! 				<td align="left">

! 					<input type="button" name="cancel" id="cancel" value="Cancel"

! 					       onclick="javascript: document.getElementById('addCountryCode').style.display = 'none'"/>

! 				</td>

! 			</tr>

! 		</table>

! 	</form>

! </div>

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div id="mainbloc">

! 	<h1>Barcodes Generator</h1>

! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

! 		<tr valign="center">

! 			<td><font size="4">Generate barcodes from inventary codes</font></td>

! 		</tr>

! 	</table>

! 	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>Select the standard type to generate barcodes.</li>

! 		<li>Define the page size for output the PDF.</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

! 		</li>

! 	</ul>

! 	<br>

! 	<form id="formulario" method="POST" action='<!-- TMPL_VAR NAME="SCRIPT_NAME" -->' name="form1"

! 	      onsubmit="return checkFields(this);" target="_blank">

! 		

! 		<table cellpadding="3" border=0 class="myTable">

! 			<!-- TMPL_IF NAME="ERROR" -->

! 			<tr align="center">

! 				<td colspan="2" >

! 					<p style="font-size:13pt;color:red">Can't find inventary codes on that range. Please try again.</p>

! 				</td>

! 			</tr>

! 			<!-- /TMPL_IF -->

!   			<tr valign="top">

! 				<td align="right" style="width:50%;padding-right:20px"> 

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Type of Interval</td>

! 						</tr>

! 						<tr align="right">

! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="width:50%;padding-left:20px"> 

! 					<div id="continuous" class="panel" style="display:inline">

! 						<table class="ranges">

! 							<tr>

! 					   			<td>From:</td> 

! 								<td><input id="from" type="text" name="from" size="20"></td>

! 							</tr>

! 							<tr>

! 					   			<td>To:</td>

! 								<td><input id="to" type="text" name="to" size="20"></td>

! 							</tr>

! 						</table>

! 					</div> 

!  				    <div id="individuals" class="panel" style="display:none">

! 						<table class="ranges">

! 							<tr valign="top">

! 								<td width="5%">

! 									Inventary Code <BR>

! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">

! 								<td>

! 								<td align="center">	

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"

! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">

! 								</td>

! 								<td width="95%">		   

! 									<select id='inventaryList' size='5' style="width:150px">

! 									</select>

! 									<input type="hidden" id='individualCodes' name="individualCodes">																						

! 								</td>

! 							</tr>

! 						</table>	

! 					</div>						

! 				</td> <!-- Fin Rangos -->

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-right:20px">

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Country Code</td>

! 						</tr>

! 						<tr align="right">

! 							<td>

! 								<div style="display:inline">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" 

! 									     style="vertical-align:bottom;cursor:pointer"

! 									     onclick="javascript: addCountryCode()">

! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->

! 								</div>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="padding-left:20px"> 

! 					<table style="border:0px">

! 						<tr>

! 							<td>Page Size</td>

! 						</tr>

! 						<tr>

! 							<td>

! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"

! 								       size="10">

! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-left:20px">Text under label</td>

! 				<td>

! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be put instead

! 				</td>

! 			</tr>

!   			<tr valign="top">

!   			    <td colspan="2" align="center">

! 			    	<table style='width:50%'>

! 						<tr style="border-color:#000FCD">

! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>

! 						</tr>

! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->

! 							<tr style="align:left">

! 								<!-- TMPL_LOOP NAME="columns" -->

! 									<td style="border:1px solid #000000">

! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->"      

! 										       name="label" <!-- TMPL_VAR NAME="check" -->>

! 										       Label  <!-- TMPL_VAR NAME="labelname" -->

! 									</td>

! 								<!-- /TMPL_LOOP -->

! 							</tr>

! 						<!-- /TMPL_LOOP -->  			    

! 					</table>

! 				</td>

!   			</tr>

!   			<tr valign="top">

!   			    <td align="right">

! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">

! 				</td>

!   			    <td align="left">

!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">

! 				</td>

!   			</tr>

! 		</table>		

! 	</form>

! </div>

! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->

--- 1,180 ----
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div class="countryPanel" style="position:absolute" id="addCountryCode">
!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
! 		<input type="hidden" name="addCode" value="1">
! 		<table style="background-color:#EFEFEF;border:1px" align="center">
! 			<tr>
! 				<th colspan="2">
! 					Add a new Country Code
! 				</th>
! 			</tr>
! 			<tr>
! 				<td>
! 					Country Name &nbsp;<input type="text" size="10" id="countryName" name="countryName"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 				<td>
! 					Country Code &nbsp;<input type="text" size="3" id="countryCode" name="countryCode"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">
! 					<input type="submit" name="submit" id="submit" value="Save Code"/>
! 				</td>
! 				<td align="left">
! 					<input type="button" name="cancel" id="cancel" value="Cancel"
! 					       onclick="document.getElementById('addCountryCode').style.display = 'none'"/>
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
! </div>
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div id="mainbloc">
! 	<h1>Barcodes Generator</h1>
! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">
! 		<tr valign="center">
! 			<td><font size="4">Generate barcodes from inventory codes</font></td>
! 		</tr>
! 	</table>
! 	<ul>
! 		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
! 		<li>Select the standard type to generate barcodes.</li>
! 		<li>Define the page size for output the PDF.</li>
! 		<li>Depending on page size, Koha will show you how the page is arranged
! 		    for each barcode. You can define wich point to start printing the page.
! 		</li>
! 	</ul>
! 	<br>
! 	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
! 		
! 		<table cellpadding="3" border=0 class="myTable">
! 			<!-- TMPL_IF NAME="ERROR" -->
! 			<tr align="center">
! 				<td colspan="2" >
! 					<p style="font-size:13pt;color:red">Can't find inventory codes in that range. Please try again.</p>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_IF -->
!   			<tr valign="top">
! 				<td align="right" style="width:50%;padding-right:20px"> 
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Type of Interval</td>
! 						</tr>
! 						<tr align="right">
! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="width:50%;padding-left:20px"> 
! 					<div id="continuous" class="panel" style="display:inline">
! 						<table class="ranges">
! 							<tr>
! 					   			<td>From:</td> 
! 								<td><input id="from" type="text" name="from" size="20"></td>
! 							</tr>
! 							<tr>
! 					   			<td>To:</td>
! 								<td><input id="to" type="text" name="to" size="20"></td>
! 							</tr>
! 						</table>
! 					</div> 
!  				    <div id="individuals" class="panel" style="display:none">
! 						<table class="ranges">
! 							<tr valign="top">
! 								<td width="5%">
! 									Inventory Code <BR>
! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
! 								<td>
! 								<td align="center">	
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"
! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">
! 								</td>
! 								<td width="95%">		   
! 									<select id="inventaryList" size="5" style="width:150px">
! 									</select>
! 									<input type="hidden" id="individualCodes" name="individualCodes">																						
! 								</td>
! 							</tr>
! 						</table>	
! 					</div>						
! 				</td> <!-- Fin Rangos -->
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-right:20px">
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Country Code</td>
! 						</tr>
! 						<tr align="right">
! 							<td>
! 								<div style="display:inline">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:bottom;cursor:pointer" onclick="addCountryCode();">
! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
! 								</div>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="padding-left:20px"> 
! 					<table style="border:0px">
! 						<tr>
! 							<td>Page Size</td>
! 						</tr>
! 						<tr>
! 							<td>
! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"
! 								       size="10">
! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-left:20px">Text under label</td>
! 				<td>
! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be used instead
! 				</td>
! 			</tr>
!   			<tr valign="top">
!   			    <td colspan="2" align="center">
! 			    	<table style="width:50%">
! 						<tr style="border-color:#000FCD">
! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
! 						</tr>
! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
! 							<tr style="align:left">
! 								<!-- TMPL_LOOP NAME="columns" -->
! 									<td style="border:1px solid #000000">
! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
! 								<!-- /TMPL_LOOP -->
! 							</tr>
! 						<!-- /TMPL_LOOP -->  			    
! 					</table>
! 				</td>
!   			</tr>
!   			<tr valign="top">
!   			    <td align="right">
! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">
! 				</td>
!   			    <td align="left">
!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">
! 				</td>
!   			</tr>
! 		</table>		
! 	</form>
! </div>
! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan  4 23:32:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 14:32:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/barcodes barcodes.tmpl,NONE,1.1 printerConfig.tmpl,NONE,1.1
Message-ID: <E1ClxE5-00013S-Cn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4015/koha-tmpl/intranet-tmpl/npl/en/barcodes

Added Files:
	barcodes.tmpl printerConfig.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- ******************************************************************************************************** -->
<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
<!-- ******************************************************************************************************** -->

<div class="data">
	<h1>Barcodes Generator</h1>
	<ul>
		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
		<li>Select the standard type to generate barcodes.</li>
		<li>Define the page size for output the PDF.</li>
		<li>Depending on page size, Koha will show you how the page is arranged
		    for each barcode. You can define wich point to start printing the page.
		</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
		
		<table class="myTable" border="1">
		<caption>Generate barcodes from inventory codes</caption>
			<!-- TMPL_IF NAME="ERROR" -->
			<tr>
				<td colspan="2">
					<p class="error">Can't find inventory codes in that range. Please try again.</p>
				</td>
			</tr>
			<!-- /TMPL_IF -->
  			<tr>
				<td><label for="rangeType">Type of Interval:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
				<td> 
					<div id="continuous" class="panel" style="display:inline">
						<table class="ranges">
							<tr>
					   			<td>From:</td> 
								<td><input id="from" type="text" name="from" size="20"></td>
							</tr>
							<tr>
					   			<td>To:</td>
								<td><input id="to" type="text" name="to" size="20"></td>
							</tr>
						</table>
					</div> 
 				    <div id="individuals" class="panel" style="display:none">
						<table class="ranges">
							<tr>
								<td width="5%">
									Inventory Code <BR>
									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
								<td>
								<td>	
									<a href="#" onclick="addItem(); return false;">&lt;&lt;</a><br>
									<a href="#" onclick="removeItem(); return false;">&gt;&gt;</a>
								</td>
								<td width="95%">		   
									<select id="inventaryList" size="5" style="width:150px">
									</select>
									<input type="hidden" id="individualCodes" name="individualCodes">																						
								</td>
							</tr>
						</table>	
					</div>						
				</td> <!-- Fin Rangos -->
			</tr>
			<tr> 
				<td><label for="numbersystem">Country Code:</label> <div style="display:inline">
									<a href="#" onclick="addCountryCode(); return false;">+</a>
									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
									<div class="countryPanel" style="position:absolute" id="addCountryCode">
 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
		<input type="hidden" name="addCode" value="1">
		<table>
			<tr><th colspan="2">Add a new Country Code</th></tr>
			<tr><td><label for="countryName">Country Name:</label></td><td><input type="text" size="10" id="countryName" name="countryName" /></td></tr>
			<tr><td><label for="countryCode">Country Code:</label></td><td><input type="text" size="3" id="countryCode" name="countryCode" /></td></tr>
			<tr>
				<td><input type="submit" name="submit" id="submit" value="Save Code" class="submit" /></td>
	<td><input type="button" name="cancel" id="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" class="cancel" /></td></tr>
		</table>
	</form>
</div>
								</div>
				</td>
				<td><label for="pageType">Page Size</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></td>
			</tr>
			<tr> 
				<td colspan="2"><label for="text_under_label">Text under label: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> <p>If this field is empty, author and title will be used instead</p></td>
			</tr></table>

						    	<table style="width:50%">
						<tr>
							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
						</tr>
						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
							<tr>
								<!-- TMPL_LOOP NAME="columns" -->
									<td style="white-space: nowrap;">
										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
								<!-- /TMPL_LOOP -->
							</tr>
						<!-- /TMPL_LOOP -->  			    
					</table>
					
<p><input type="submit" value="Generate Barcodes" name="B1" class="submit"></p>
	</form>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcode Generator Printer Configuration<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

	<h1>Printer Configuration</h1>
	<h3>Set the printer configuration corresponding to your environment</h3>
	<ul>
		<li>Set width and height of the label that you are going to work with.</li>
		<li>Set your system's default DPI.</li>
		<li>Set the page size.</li>
		<li>Select how many columns and rows are in your page size.</li>
		<li>Set the left margin bottom margin the page that you are going to use. This parameters will help to center the barcodes into the labels.</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
		<input type="hidden" name="saveSettings" value="1">
		<div class="table"><table border="1" class="myTable">
			<tr>
				<th>Label width (in mm)</th>
				<th>Label height (in mm)</th>
				<th>System DPI</th>
				<th>Page Size</th>
				<th>Columns</th>
				<th>Rows</th>
				<th>Margin Bottom (mm)</th>
				<th>Margin Left (Expressed in mm)</th>
			<tr>
  			<tr>
				<td> <input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->"></td>
				<td><input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->"></td>
				<td><input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->"></td>
				<td><select name="pageType" id="pageType" size="1">
						<!-- TMPL_IF name="A4" -->
							<option value="A4" selected>A4</option>
				        <!-- TMPL_ELSE -->
							<option value="A4">A4</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Letter" -->
							<option value="Letter" selected>Letter</option>
				        <!-- TMPL_ELSE -->
							<option value="Letter">Letter</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Legal" -->
							<option value="Legal" selected>Legal</option>
				        <!-- TMPL_ELSE -->
							<option value="Legal">Legal</option>
						<!-- /TMPL_IF -->
		            </select></td>
  			    <td><input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->"></td>
  			    <td><input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->"></td>
  			    <td><input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->"></td>
  			    <td><input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->"></td>
  			</tr></table></div>
<p>		<input type="submit" value="Save Settings" class="submit"></p>
	</form>

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:31:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:31:20 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.22,1.23 Install.pm,1.87,1.88 koha.upgrade,1.16,1.17
Message-ID: <E1CmCC0-00074e-Ff@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147/misc

Modified Files:
	buildrelease Install.pm koha.upgrade 
Log Message:
minor update just before releasing official 2.2.0

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** buildrelease	16 Nov 2004 13:04:18 -0000	1.22
--- buildrelease	5 Jan 2005 14:31:06 -0000	1.23
***************
*** 219,223 ****
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! system("cvs update -P");
  if ($cvstag) {
      print qq|
--- 219,223 ----
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! # system("cvs update -P");
  if ($cvstag) {
      print qq|

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** Install.pm	3 Jan 2005 11:11:10 -0000	1.87
--- Install.pm	5 Jan 2005 14:31:17 -0000	1.88
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 149,153 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 1819,1823 ****
  such as DANMARC.  We would like to hear from you if you do.
  
! UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
--- 1819,1824 ----
  such as DANMARC.  We would like to hear from you if you do.
  
! *** UPGRADE ***
! If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
***************
*** 1827,1833 ****
  
    en : default language, all pages available
!   fr : complete translation (except pictures)
!   es : partial librarian site translation (including pictures)
!   pl : complete OPAC and partial librarian translation
    zh_TW : partial translation
  
--- 1828,1833 ----
  
    en : default language, all pages available
!   fr : complete translation
!   es : partial librarian site translation
    zh_TW : partial translation
  

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** koha.upgrade	23 Nov 2004 16:02:33 -0000	1.16
--- koha.upgrade	5 Jan 2005 14:31:17 -0000	1.17
***************
*** 15,34 ****
  loadconfigfile();
  
! my $kohaversion=`cat koha.version`;
! chomp $kohaversion;
! Install::setkohaversion $kohaversion;
  
  
! if ($kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
! 
! unless ($answer =~/y/i) {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
- } else {
- 	print "Great! continuing upgrade... \n";
  };
  
--- 15,33 ----
  loadconfigfile();
  
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! Install::setkohaversion $::newversion;
  
  
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
! if ($answer eq "Y" || $answer eq "y") {
! 	print "Great! continuing upgrade... \n";
! } else {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
  };
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist.tmpl,1.7,1.8
Message-ID: <E1CmCDA-00078D-7s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27401/koha-tmpl/intranet-tmpl/default/en/authorities

Modified Files:
	searchresultlist.tmpl 
Log Message:


Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** searchresultlist.tmpl	2 Dec 2004 16:41:07 -0000	1.7
--- searchresultlist.tmpl	5 Jan 2005 14:32:30 -0000	1.8
***************
*** 43,47 ****
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist='<!-- TMPL_VAR NAME="biblio_fields" -->'&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
--- 43,47 ----
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.11,1.12
Message-ID: <E1CmCDb-00079k-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	about.tmpl 
Log Message:
updated credits for 2.2 release

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** about.tmpl	19 Jul 2004 21:41:29 -0000	1.11
--- about.tmpl	5 Jan 2005 14:32:56 -0000	1.12
***************
*** 3,98 ****
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
- 	
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Koha version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>OS version (from 'uname -a'):</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Perl version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>MySQL version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Apache version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Credits</td>
! 			<td>
! 				<h2>Core team</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>, Kaitiaki<br/>
! 							<b>Paul Poulain</b>, 2.2 release manager (MARC developper)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco, (Documentation Compiler)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, French Translation<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							<b>Horowhenua Library Trust</b> : Rosalie Blake, Head of Libraries<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Thanks to</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polish for 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri-Damien Laurent<br/>
! 							J�rome Vizcaino (Esiee School)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee School)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Esiee School)<br/>
! 							Pawel Skuza (Polish for 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 3,72 ----
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<div id="bloc25">
! 		<h2>Server information</h2>
! 		<p><label class="label100">Koha version</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">OS version ('uname -a')</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">Perl version</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">MySQL version</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Special thanks to the following funders</h2>
! 		<p><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
! 		<p>The <b>Nelsonville Public Library</b> (MARC support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>ENSMP (Ecole Nationale Sup�rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Core team for 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</p>
! 		<p>Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
! 		<p>Nicholas Rosasco, (Documentation Compiler)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Thanks to</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) OPAC basket</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee School</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri-Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin (French Translation in 2.0)</p>
! 					<p>Pawel Skuza (Polish for 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:33:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:33:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.3,1.4 auth.tmpl,1.3,1.4 bookcount.tmpl,1.3,1.4 boraccount.tmpl,1.6,1.7 charges.tmpl,1.3,1.4 intranet-main.tmpl,1.8,1.9 modbibitem.tmpl,1.3,1.4 moditem.tmpl,1.3,1.4 overdue.tmpl,1.3,1.4 reports.tmpl,1.3,1.4 request.tmpl,1.7,1.8 shelves.tmpl,1.3,1.4 thesaurus_popup.tmpl,1.5,1.6
Message-ID: <E1CmCE1-0007CD-3y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27604/koha-tmpl/intranet-tmpl/default/fr

Modified Files:
	about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl 
	charges.tmpl intranet-main.tmpl modbibitem.tmpl moditem.tmpl 
	overdue.tmpl reports.tmpl request.tmpl shelves.tmpl 
	thesaurus_popup.tmpl 
Log Message:
french version for 2.2.0

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/about.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** about.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- about.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 2,96 ****
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" -->   <h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Version Koha</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version de l'OS (depuis 'uname -a) :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>version PERL :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version MySQL</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version Apache :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Cr�dits</td>
! 			<td>
! 				<h2>Contributeurs principaux</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>,Kaitiaki<br/>
! 							<b>Paul Poulain</b>, responsable de la version 2.2 (d�veloppeur MARC)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco,(r�dacteur de la documentation)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, traduction fran�aise<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							 <b>Groupement de biblioth�ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth�ques<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Merci �</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polonais pour version 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri Damien Laurent<br/>
! 							J�rome Vizcaino (Esiee Paris)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Ecole Esiee)<br/>
! 							Pawel Skuza (Polonais pour la version 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 2,71 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" --> <h1>Informations sur la version actuelle de Koha pour le rapport de bogues (ou d'int�r�t g�n�ral).</h1>  \t 
! 	<div id="bloc25">
! 		<h2>Information serveur</h2>
! 		<p><label class="label100">Version Koha</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">Version de l'OS ('uname -a) :</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">version PERL :</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">Version MySQL</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Un merci particulier aux financeurs suivants</h2>
! 		<p><b>Groupement de biblioth�ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth�ques (Koha 1.0)</p>
! 		<p>La <b>Biblioth�que Publique de Nelsonville</b> (support MARC)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (modules suggestion et stats, support ldap am�lior�)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Contributeurs principaux pour la version 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, responsable de la version 2.2 (d�veloppeur MARC)</p>
! 		<p>Stephen Hedges et La <b>Biblioth�que Publique de Nelsonville</b> (Financement du codage MARC)</p>
! 		<p>Nicholas Rosasco,(r�dacteur de la documentation)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray et <b>Turo Technology LLP</b>, (contr�le qualit�, installation et mise � jour, maintenance de la version 2.0)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>et Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Merci �</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polonais pour version 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) panier OPAC</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin, (traduction fran�aise 2.0)</p>
! 					<p>Pawel Skuza (Polonais pour la version 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (pr�paration MARC, conception des Etag�res virtuelles, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- auth.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 18,22 ****
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2> Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r�essayer.</h2>
  <!-- /TMPL_IF -->
  
--- 18,22 ----
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2>Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r�essayer.</h2>
  <!-- /TMPL_IF -->
  

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bookcount.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- bookcount.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE BARRE <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
--- 5,9 ----
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE A BARRES <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
***************
*** 11,15 ****
  		<td width="440">
  
! 		</b> <!-- TMPL_VAR NAME="homebranch" -->'><b>Site d'origine: </b>  <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv�e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
--- 11,15 ----
  		<td width="440">
  
! 		<b>Site d'origine: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv�e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** boraccount.tmpl	24 Nov 2004 16:22:25 -0000	1.6
--- boraccount.tmpl	5 Jan 2005 14:33:21 -0000	1.7
***************
*** 3,7 ****
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour</h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr�er une facture manuelle</a>
  <center>
--- 3,7 ----
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr�er une facture manuelle</a>
  <center>

Index: charges.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** charges.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- charges.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 4,9 ****
  
  <p>
! Each box needs to be filled in with fine,time to start charging,charging cycle<br>
!  par exemple 1,7,7 signifie 1EUR d'amende, apr�s 7 jours, tous les 7 jours.<p>
  
  <table>
--- 4,9 ----
  
  <p>
! Chaque cellule doit �tre remplie avec l'amende, l'�ch�ance et la dur�e des charges<br>
! par exemple 1,7,7 signifie 1EUR d'amende, apr�s 7 jours, tous les 7 jours.<p>
  
  <table>

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** intranet-main.tmpl	24 Nov 2004 16:22:25 -0000	1.8
--- intranet-main.tmpl	5 Jan 2005 14:33:21 -0000	1.9
***************
*** 74,78 ****
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Search a biblio. When this biblio is found, you can check its status, reserve it, or see where it is</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth�que</p>
--- 74,78 ----
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Rechercher une notice.Quand ce document est trouv�, vous pouvez v�rifier son �tat, faire une r�servation, ou bien voir o� il se trouve</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth�que</p>
***************
*** 80,86 ****
  				<p>Gestion des abonnements et des p�riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag�res Virtuelles</a>
! 				<p>Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one.
! 				The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic.
! 				It can be used by a library to define "most valuable books for &lt;some category of patron&gt;"</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
--- 80,84 ----
  				<p>Gestion des abonnements et des p�riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag�res Virtuelles</a>
! 				<p>Les �tag�res virtuelles peuvent �tre utilis�es par des biblioth�caires ou des usagers pour constituer des biblioth�ques virtuelles au sein de la vraie. L'�tag�re virtuelle peut �tre utilis� par un enseignant pour aider ses �l�ves dans la recherche d'information sur un sujet particulier.On peut l'utiliser  dans une biblioth�que pour indiquer des listes de documents (les plus emprunt�s, les plus repr�sentatifs...).</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
***************
*** 107,122 ****
  			<p>Aller � la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Add a member in the library. The member can be attached to any branch of the library. He or she can also have children.</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit�</a>
! 			<p>Add an organisation in the library. This member doesn't have some information a "physical" member has.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Lignes de Commande, recevoir des commandes, �tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Rapports</h1>
! 			Tous les rapports syst�me
  		</div>
  		<div id="Hint5" class="hint">
--- 105,120 ----
  			<p>Aller � la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Ajouter un lecteur � la biblioth�que.Le lecteur peut-�tre rattach�  � n'importe quel site de la biblioth�que.Il ou elle peut aussi avoir des enfants</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit�</a>
! 			<p>Ajouter une collectivit� � la biblioth�que.Cette inscription ne peut contenir les m�mes informations que pour une personne physique.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Commander des documents, recevoir des commandes, �tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Bilans</h1>
! 			Tous les bilans du syst�me
  		</div>
  		<div id="Hint5" class="hint">
***************
*** 126,136 ****
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param�tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G�n�rateur de code-barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Fonds de livres</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r�servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr�t</h1>
! 			Work at the front desk on Issues and returns using only a barcode reader and a mouse
  		</div>
  <!-- MAIN MENU -->
--- 124,134 ----
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param�tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G�n�rateur de code � barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Lignes de cr�dit</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r�servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr�t</h1>
! 			A la banque de pr�t, effectuez les pr�ts et les retours, en utilisant uniquement un lecteur de code barre et une souris
  		</div>
  <!-- MAIN MENU -->
***************
*** 145,149 ****
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit�s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Rapports</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param�tres</a><br/>
--- 143,147 ----
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit�s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Bilans</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param�tres</a><br/>

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modbibitem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- modbibitem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 36,40 ****
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Localisation</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
--- 36,40 ----
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Emplacement</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
***************
*** 68,78 ****
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES BARRES<br>
! 			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code Barre</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
--- 68,78 ----
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES A BARRES<br>
! 			Pointez TOUS les codes-barres auquels les changements s'appliquent.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code � Barres</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
***************
*** 99,104 ****
  
  
! <b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
!  items, tick the appropriate ones and a new group record will be created automatically for them.
   <br clear="all">
   <p> &nbsp; </p>
--- 99,103 ----
  
  
! <b>AIDE:</b>Vous<b>devez</b>cliquer sur le bouton ad�quat (dans les pav�s verts), et choisir soit de d�placer le(s) exemplaire(s)vers un enregistrement d�j� existant dans la base, soit de modifier cet enregistrement. Si vos modifications ne concernent que quelques exemplaires, pointer ceux qui sont concern�s et une nouvelle notice sera cr��e automatiquement pour eux.
   <br clear="all">
   <p> &nbsp; </p>

Index: moditem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** moditem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- moditem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code Barre</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
--- 5,9 ----
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code � Barres</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">

Index: overdue.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overdue.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- overdue.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 6,10 ****
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Usager</th>
  		<th class="reports">T�l�phone</th>
  		<th class="reports">Titre</th>
--- 6,10 ----
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Emprunteur</th>
  		<th class="reports">T�l�phone</th>
  		<th class="reports">Titre</th>

Index: reports.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** reports.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- reports.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> rapports </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> bilans </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.tmpl	24 Nov 2004 16:22:26 -0000	1.7
--- request.tmpl	5 Jan 2005 14:33:21 -0000	1.8
***************
*** 103,107 ****
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>
--- 103,107 ----
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- shelves.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 32,36 ****
  		<tr>
  			<td>
! 				ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>
--- 32,36 ----
  		<tr>
  			<td>
! 				Ajouter un livre par code � barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>

Index: thesaurus_popup.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** thesaurus_popup.tmpl	24 Nov 2004 16:22:26 -0000	1.5
--- thesaurus_popup.tmpl	5 Jan 2005 14:33:21 -0000	1.6
***************
*** 33,37 ****
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 33,37 ----
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�: <input type="text" name="insert">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:34:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:34:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint - New directory
Message-ID: <E1CmCFA-0007H7-LO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27952/koha-tmpl/intranet-tmpl/default/fr/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint catmaintain.tmpl,NONE,1.1
Message-ID: <E1CmCFv-0007Me-B8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/maint

Added Files:
	catmaintain.tmpl 
Log Message:
french version for 2.2.0

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="cat-top.inc" -->


<!-- TMPL_IF NAME=allsub-p -->
<!-- TMPL_LOOP NAME="loop" -->
"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
Sujet:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
<input type="hidden" name="type" value="upsub">
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
<input type="submit" value="modifier">
</form>
<p>Cela changera la vedette-sujet dans toutes les notices o� ce sujet est utilis�.
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Modification r�ussie <!-- TMPL_VAR NAME="oldsub" escape=html --> est maintenant <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table border="0">
<thead>
<tr><th>Titre</th><th>Auteur</th><th>Reprendre</th></tr>
<tbody>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Reprendre</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
Annulation de suppression r�ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour � la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
<input type="hidden" name="type" value="updatetype">
Type de document : <input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
<input type="submit" value="Changer">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
Mise � jour r�ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour � la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<b>Maintenance des Sujets</b><br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="allsub">
Voir tous les sujets commen�ant par <input type="text" name="sub"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Maintenance des groupes</b></br>
<form action="/cgi-bin/koha/search.pl" method="post">
<input type="hidden" name="type" value="catmain">
Voir tous les Titres commen�ant par <input type="text" name="title"><br>
Num�ro de l'exemplaire <input type="text" size="25" name="item"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Reprendre Notice</b></br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="undel">
Voir tous les Titres commen�ant par <input type="text" name="title"><br>
<input type="submit" value="Voir">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007NK-49@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/user

Modified Files:
	userpage.tmpl 
Log Message:
french version for 2.2.0

Index: userpage.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** userpage.tmpl	24 Nov 2004 16:21:16 -0000	1.3
--- userpage.tmpl	5 Jan 2005 14:35:22 -0000	1.4
***************
*** 19,23 ****
  	</ul>
  	<p>
! 	<b>Vous avez reserv� les ouvrages en pr�t suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
--- 19,23 ----
  	</ul>
  	<p>
! 	<b>Vous avez r�serv� les documents suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
***************
*** 56,60 ****
  			<input name="overduesbyemail" type="checkbox" checked> Pr�venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox">  Autoriser l'�quipe de la biblioth�que � consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>
--- 56,60 ----
  			<input name="overduesbyemail" type="checkbox" checked> Pr�venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox"> Autoriser l'�quipe de la biblioth�que � consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc result.tmpl,1.5,1.6 search.tmpl,1.6,1.7
Message-ID: <E1CmCFx-0007NH-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/search.marc

Modified Files:
	result.tmpl search.tmpl 
Log Message:
french version for 2.2.0

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** result.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- result.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 7,39 ****
  	<h1 class="catalogue">R�sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
! 				</a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 					<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
! 		<p>
! 			<!-- TMPL_IF NAME="total" -->
! 			&nbsp;<b>R�ponses <!-- TMPL_VAR NAME="from" --> �  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --></b><br><br>
! 			<!-- TMPL_ELSE -->
! 			Pas de r�ponse<br>
! 			<!-- /TMPL_IF -->
! 		</p>
! 	</div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">Abr�g�</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
--- 7,17 ----
  	<h1 class="catalogue">R�sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr�c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
! 		<p class="resultcount"><!-- TMPL_IF NAME="total" -->R�ponses <!-- TMPL_VAR NAME="from" --> �  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->Pas de r�ponse<!-- /TMPL_IF --></p></div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">R�sum�</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
***************
*** 42,54 ****
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 					<p>
! 						<p>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- TMPL_ELSE -->
! 								<b><a class="transparent" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 							<!-- /TMPL_IF -->
! 						</p>
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
--- 20,28 ----
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
  							<!-- TMPL_ELSE -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>				<!-- /TMPL_IF -->
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
***************
*** 88,106 ****
  	</div>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
  	</div>	
  </div>
--- 62,67 ----
  	</div>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr�c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
  	</div>	
  </div>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	24 Nov 2004 16:19:00 -0000	1.6
--- search.tmpl	5 Jan 2005 14:35:22 -0000	1.7
***************
*** 8,100 ****
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search" />
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! 			<label class="label100">Ajouter un mot</label>
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Auteur</label> <input type="hidden" name="marclist" value="biblio.author" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100">Code Barre de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /> 
! 		</p>
! 		<p>
! 			<label class="label100">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  	</div>
--- 8,100 ----
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div class="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search">
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Tous les mots</label>
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="keyword" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="title">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="author">Auteur</label> <input type="hidden" name="marclist" value="biblio.author">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="subject">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">  
! 			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="itemtype">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100" for="branch">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="=">  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100" for="barcode">Code � Barres de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" id="barcode" onchange="sql_update()"> 
! 		</p>
! 		<p>
! 			<label class="label100" for="callno">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="start">
! 			<input type="text" name="value" id="callno" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="isbn">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
! 			<input type="text" name="value" id="isbn" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="publisher">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="publisher" onchange="sql_update()">
  		</p>
  	</div>
***************
*** 125,139 ****
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button catalogue" value="Ajouter un crit�re" onclick="AddStatement()" class="button catalogue">
! 		Warning : the "contains" statement does NOT work if you enter 2 or less letters
  	</div>
! 	<div id="bloc25">
! 		<p>
! 			<div name="sql">
! 				<textarea name="sql" rows="3" cols="70" disabled readonly></textarea>
! 			</div>
! 		</p>
  		<p>R�sultats par page :
! 			<select align="right" name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
--- 125,135 ----
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button" value="Ajouter un crit�re" onclick="AddStatement()" class="button catalogue">
! 		Attention : l'option "contient" NE FONCTIONNE PAS si vous n'indiquez pas au moins 3 caract�res.</p>
  	</div>
! 	<div class="bloc25">
! 		<p><textarea name="sql" rows="3" cols="70" disabled readonly></textarea></p>
  		<p>R�sultats par page :
! 			<select name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 147,151 ----
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/suggestion acceptorreject.tmpl,1.1,1.2 mail_suggestion_ACCEPTED.tmpl,1.1,1.2 mail_suggestion_AVAILABLE.tmpl,1.1,1.2 mail_suggestion_ORDERED.tmpl,1.1,1.2 mail_suggestion_REJECTED.tmpl,1.1,1.2
Message-ID: <E1CmCFx-0007NZ-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/suggestion

Modified Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
french version for 2.2.0

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- acceptorreject.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 24,28 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
--- 24,28 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->

Index: mail_suggestion_ACCEPTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ACCEPTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ACCEPTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ACCEPTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --><!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a examin� votre suggestion aujourd'hui, et l'a trouv�e int�ressante. Le document sera achet� d�s que possible. Vous serez alert� par messagerie lorsque l'acquisition sera r�alis�e, puis avertis par messagerie � nouveau lorsque le document sera � la biblioth�que. Pour toute question, adressez- vous � <!-- TMPL_VAR name="libemail" -->. Merci, <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_AVAILABLE.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_AVAILABLE.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_AVAILABLE.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_AVAILABLE.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. Nous sommes heureux de vous annoncer que le *** est maintenant dans la la biblioth�que. Si vous avez une question, n'h�sitez pas � nous �crire � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_ORDERED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ORDERED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ORDERED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ORDERED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.  You will be notified again when the book is available.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->Nous avons le plaisir de vous informer que le livre a �t� command�.Il devrait arriver bient�t � la biblioth�que.Nous vous enverrons un autre mail quand le livre sera disponible. Pour toute question, envoyez nous un message �lectronique � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_REJECTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_REJECTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_REJECTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_REJECTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a trait� votre demande aujourd'hui et a d�cid� de ne pas accepter votre suggestion. Si vous une question, n'h�sitez pas � nous �crire � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports inventory.tmpl,1.2,1.3 issues_by_borrower_category.tmpl,1.1,1.2 itemtypes.tmpl,1.1,1.2 reports-home.tmpl,1.5,1.6
Message-ID: <E1CmCFx-0007NP-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/reports

Modified Files:
	inventory.tmpl issues_by_borrower_category.tmpl itemtypes.tmpl 
	reports-home.tmpl 
Log Message:
french version for 2.2.0

Index: inventory.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/inventory.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** inventory.tmpl	24 Nov 2004 16:19:00 -0000	1.2
--- inventory.tmpl	5 Jan 2005 14:35:22 -0000	1.3
***************
*** 5,14 ****
  		<h2 class="reports">S�lectionnez les exemplaires que vous souhaitez v�rifier</h2>
  		<p>
! 			Localisation de l'exemplaire (items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>voir</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen�ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
--- 5,14 ----
  		<h2 class="reports">S�lectionnez les exemplaires que vous souhaitez v�rifier</h2>
  		<p>
! 			Cote de l'exemplaire ((items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>afficher</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen�ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
***************
*** 29,33 ****
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code Barre</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>
--- 29,33 ----
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code � Barres</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>

Index: issues_by_borrower_category.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issues_by_borrower_category.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- issues_by_borrower_category.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 40,44 ****
  	<h1>Pr�ts par cat�gories de lecteurs</h1>
  	<form method="post">
! 		<p>Select a borrower category (or don't if you want to see global status) <input type="text" name="value"></p>
  		<p>S�lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">
--- 40,44 ----
  	<h1>Pr�ts par cat�gories de lecteurs</h1>
  	<form method="post">
! 		<p>S�lectionner une cat�gorie de lecteur (ou rien si vous souhaitez visualiser l'�tat global) <input type="text" name="value"></p>
  		<p>S�lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">

Index: itemtypes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** itemtypes.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- itemtypes.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 23,27 ****
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		 S�lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
--- 23,27 ----
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		S�lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">

Index: reports-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** reports-home.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- reports-home.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 2,10 ****
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Rapports</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r�gl�s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r�gl�s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Ouvrages en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r�colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>
--- 2,10 ----
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Bilans</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r�gl�s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r�gl�s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Documents en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r�colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_225a.tmpl,1.3,1.4 unimarc_field_60X.tmpl,1.4,1.5 unimarc_field_700-4.tmpl,1.3,1.4 unimarc_field_700_701_702.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007Nn-NI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_225a.tmpl unimarc_field_60X.tmpl 
	unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl 
Log Message:
french version for 2.2.0

Index: unimarc_field_225a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_225a.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_225a.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,16 ****
! <html>
! <head>
! <title>Constructeur de champ UNIMARC 225a</title>
  </head>
  <body>
! <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Selectionnez une collection</td>
! 		<td><!-- TMPL_VAR name="collection" --></td>
! 	</tr>
! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
! </table>
! </form>
  <script>
  	function report() {
--- 1,13 ----
! <!-- TMPL_INCLUDE name="auth-search-top.inc" -->
! <title>UNIMARC Field 225a builder</title>
  </head>
  <body>
! <div id="mainbloc">
! 	<form name="f_pop" onSubmit="javascript:report()">
! 		<h2 class="authority">Collection</h2>
! 		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
! 		<input type="submit" value="OK" class="button authority"></p>
! 	</form>
! </div>
  <script>
  	function report() {
***************
*** 20,23 ****
  	}
  </script>
! </body>
! </html>
--- 17,19 ----
  	}
  </script>
! <!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->

Index: unimarc_field_60X.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_60X.tmpl	24 Nov 2004 16:21:17 -0000	1.4
--- unimarc_field_60X.tmpl	5 Jan 2005 14:35:23 -0000	1.5
***************
*** 1,5 ****
  <html>
  <head>
! 	<title>Recherche Th�saurus</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! 	<title>Thesaurus search</title>
  </head>
  <body>
***************
*** 38,42 ****
  	<tr>
  		<td valign="top">
! 		<h2>R�ponses</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
--- 38,42 ----
  	<tr>
  		<td valign="top">
! 		<h2>Results</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
***************
*** 57,61 ****
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>D�pendances</h2>
  			<!-- /TMPL_IF -->
  			<table>
--- 57,61 ----
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>Dependancies</h2>
  			<!-- /TMPL_IF -->
  			<table>
***************
*** 73,82 ****
  	</tr>
  	</table>
! <h2>Ajout en cours</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Cr�er une nouvelle autorit�/entr�e au th�saurus : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>
--- 73,82 ----
  	</tr>
  	</table>
! <h2>Adding</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>

Index: unimarc_field_700-4.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700-4.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700-4.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 11,15 ****
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>Illustrateur</option>
  			<option value="080 - pr�face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr�face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
--- 11,15 ----
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
  			<option value="080 - pr�face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr�face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>

Index: unimarc_field_700_701_702.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700_701_702.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700_701_702.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,5 ****
  <html>
  <head>
! <title>Constructeur d'autorit� nom de personne</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! <title>Personal Authorities builder</title>
  </head>
  <body>
***************
*** 14,18 ****
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="FIN" onclick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
--- 14,18 ----
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="END" onClick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
***************
*** 30,34 ****
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 30,34 ----
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�: <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ branchtransfers.tmpl,1.6,1.7 circulation.tmpl,1.10,1.11 returns.tmpl,1.6,1.7
Message-ID: <E1CmCGP-0007P7-QQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** branchtransfers.tmpl	24 Nov 2004 16:14:37 -0000	1.6
--- branchtransfers.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 6,10 ****
  
  <h1>Pr�t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" -->   <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer Param�tres</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,10 ----
  
  <h1>Pr�t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" --> <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer R�glages</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 84,88 ****
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
--- 84,88 ----
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code � barres : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
***************
*** 106,110 ****
  		</select></p>
  
! 	<p><b>Entrez le Code Barre du document :</b> Code Barre du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
--- 106,110 ----
  		</select></p>
  
! 	<p><b>Entrez le Code � Barres du document :</b> Code � Barres du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
***************
*** 120,124 ****
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf�r�s</th></tr>
! 		<tr><th>Code Barre</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>�</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 120,124 ----
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf�r�s</th></tr>
! 		<tr><th>Code � Barres</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>�</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** circulation.tmpl	24 Nov 2004 16:14:38 -0000	1.10
--- circulation.tmpl	5 Jan 2005 14:35:19 -0000	1.11
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Circulation : pr�ts</h1>
  
  <!--
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Pr�t : Sorties</h1>
  
  <!--
***************
*** 11,15 ****
  		<h2 class="circulation">Param�tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param�tres</a>
  		</p>
  	
--- 11,15 ----
  		<h2 class="circulation">Param�tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R�glages</a>
  		</p>
  	
***************
*** 41,45 ****
  			</p>
  			<p>Cat�gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Pr�ts<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
--- 41,45 ----
  			</p>
  			<p>Cat�gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
***************
*** 65,70 ****
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code barre du livre</h2>
! 		<p>Code Barre de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr�ter" class="button circulation"></p>
  		<p>
  			<select name="day">
--- 65,70 ----
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code � barres du livre</h2>
! 		<p>Code � Barres de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr�ter" class="button circulation"></p>
  		<p>
  			<select name="day">
***************
*** 152,156 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code barre est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 152,156 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code � barres est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 196,199 ****
--- 196,205 ----
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
  			<form method="post">
+ 				<!-- TMPL_IF NAME="RESERVED" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r�servation</p>
+ 				<!-- /TMPL_IF -->
+ 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r�servation</p>
+ 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">">
***************
*** 203,206 ****
--- 209,213 ----
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
  				<input type="submit" value="Confirmer le pr�t" class="button circulation">
+ 				<a href="circulation.pl?borrnumber=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button circulation">Ne pas pr�ter</a>
  			</form>
  			<!-- /TMPL_UNLESS -->
***************
*** 224,228 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 231,235 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code � Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
***************
*** 253,257 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 260,264 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code � Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** returns.tmpl	24 Nov 2004 16:14:38 -0000	1.6
--- returns.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 4,8 ****
  	<h1 class="circulation">Pr�t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param�tres</a>
  	</p>
  	
--- 4,8 ----
  	<h1 class="circulation">Pr�t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R�glages</a>
  	</p>
  	
***************
*** 11,15 ****
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
! 			<p> Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not� en attente � <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
--- 11,15 ----
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
! 			<p>Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not� en attente � <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 25,29 ****
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
  				<p>
! 					Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  needs to be transfered to <b><!-- TMPL_VAR NAME="branchname" --></b>  to be picked up by  <!-- TMPL_VAR NAME="name" -->  (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
--- 25,29 ----
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
  				<p>
! 					L'exemplaire: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) doit �tre transf�r� � <b><!-- TMPL_VAR NAME="branchname" --></b> pour �tre retir� par <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
***************
*** 43,47 ****
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R�servation trouv�e</h2>
! 				<p>Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">  <!-- TMPL_VAR NAME="itembarcode" -->  </a>  for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
--- 43,47 ----
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R�servation trouv�e</h2>
! 				<p>Exemplaire : <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) peut �tre retir� � <b> <!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
***************
*** 84,89 ****
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code barre du livre</h2>
! 				<label class="label20">Code Barre de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
--- 84,89 ----
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code � barres du livre</h2>
! 				<label class="label20">Code � Barres de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 100,104 ****
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
--- 100,104 ----
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code � barres : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
***************
*** 119,123 ****
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur l'ouvrage rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
--- 119,123 ----
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur le document rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
***************
*** 162,174 ****
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Ouvrages rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code Barre</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Lecteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->
--- 162,174 ----
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Documents rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code � Barres</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Emprunteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help bull-home.tmpl,1.1,1.2
Message-ID: <E1CmCGP-0007PB-V2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help

Modified Files:
	bull-home.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:50 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 2,11 ****
  	<h1>Aide de Abonnement P�riodiques</h1>
  	<ul>
! 		<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  		<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv� l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d�tails de l'abonnement</li>
! 				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC & librarian interface)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 2,11 ----
  	<h1>Aide de Abonnement P�riodiques</h1>
  	<ul>
! 		<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  		<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv� l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d�tails de l'abonnement</li>
! 				<li>Recevoir chaque num�ro et/ou g�r� ce qui s'affiche dans le r�sum� de l'abonnement (� l'OPAC et dans l'interface biblioth�caire)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1CmCGQ-0007PD-2h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
french version for 2.2.0

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	24 Nov 2004 16:13:32 -0000	1.2
--- addbookbybiblionumber.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 6,11 ****
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter une �tag�re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<input type="submit" value="Ajouter une �tag�re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 6,19 ----
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter dans l'�tag�re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<p>ou ajouter une nouvlle �tag�re virtuelle </p>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 		<select name="category">
! 			<option value="1">Priv�</option>
! 			<option value="2">Publique</option>
! 			<option value="3">Libre</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Ajouter dans l'�tag�re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	24 Nov 2004 16:13:33 -0000	1.2
--- shelves.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 4,63 ****
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Contenus de <!-- TMPL_VAR NAME="shelfname" -->
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="itemsloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  				</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<br>
! 		<a href="shelves.pl" class="button">Liste des �tag�res</a>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<!-- TMPL_IF name="manageshelf" -->
! 			<input type="submit" value="Retirer les Exemplaires S�lectionn�s" class="button">
! 		<!-- /TMPL_IF -->
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<form>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<table>
! 			<tr>
! 				<td>
! 					ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
! 				</td>
! 				<td>
! 					<input name="addbarcode">
! 					<input type="hidden" name="modifyshelfcontents" value="1">
! 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 					<input type="submit" value="Enregistrer" class="button">
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
- 		<h1 class="catalogue">Etag�res</h1>
  		<div id="bloc25">
  					<h2 class="catalogue">S�lectionner les Etag�res � Supprimer</h2>
--- 4,64 ----
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div id="bloc25">
! 		<h2 class="catalogue">Contenu des Etag�res</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th class="catalogue">supprimer</th>
! 					<th class="catalogue">Code � Barres</th>
! 					<th class="catalogue">Titre</th>
! 					<th class="catalogue">Auteur</th>
  				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Retirer les Exemplaires S�lectionn�s" class="button catalogue">
! 			<!-- /TMPL_IF -->
! 		</div>
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc25">
! 		<form>
! 		<h2 class="catalogue">Ajouter un livre par code � barre</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Enregistrer" class="button catalogue">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
+ 	<div id="bloc25">
+ 		<a href="shelves.pl" class="button catalogue">Liste des �tag�res</a>
+ 	</div>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1 class="catalogue">Etag�res</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  		<div id="bloc25">
  					<h2 class="catalogue">S�lectionner les Etag�res � Supprimer</h2>
***************
*** 70,74 ****
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
  						</p>
  						<!-- /TMPL_IF -->
--- 71,75 ----
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"> <!-- TMPL_VAR NAME="shelfname" --> </a> (<!-- TMPL_VAR NAME="shelfbookcount" --> document(s))
  						</p>
  						<!-- /TMPL_IF -->
***************
*** 92,98 ****
  					</select>
  				</p>
! 				<p> <li> une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
! 					<li>  Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
! 					<li> Une �tag�re libre peut-�tre g�r�e par tous les usagers</li>
  				</p>
  				<p>
--- 93,99 ----
  					</select>
  				</p>
! 				<p> <li>une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
! 					<li> Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
! 					<li> Une �tag�re libre peut-�tre g�r�e par tous les utilisateurs.</li>
  				</p>
  				<p>
***************
*** 104,128 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Liste des Etag�res
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des �tag�res virtuelles</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
--- 105,191 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc25">
! 			<h2 class="catalogue">Liste des �tag�res</h2>
! 			<table class="small">
! 				<tr>
! 					<th class="catalogue">Nom de l'�tag�re</th>
! 					<th class="catalogue">Cat�gorie</th>
! 					<th class="catalogue">Contenu</th>
! 					<th class="catalogue">Modifier</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Priv�
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Publique
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Libre
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> documents
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modifier</a> <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc25">
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des �tag�res virtuelles</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc25">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2 class="catalogue">Modifier l'�tag�re</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Nom</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Propri�taire</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Cat�gorie</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Priv�</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Priv�</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Publique</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Publique</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Libre</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Libre</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
+ 				<li> Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
+ 				<li> Une �tag�re libre peut-�tre g�r�e par tous les utilisateurs.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Enregistrer" class="button catalogue">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pc-Bm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/circ

Modified Files:
	circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** circulation.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- circulation.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Circulation : pr�ts</h1>
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>
  
! <p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>
  
! <p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>
  
! <p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
! <p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,11 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Pr�t/Aide des sorties</h1>
! <p>Avant de commencer, il est tr�s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n�cessaire.Cela devra �tre fait seulement la premi�re fois que vous ferez du pr�t (ou des retours) � partir d'un poste de travail, ensuite un cookie du navigateur m�morisera le r�glage correct.</p>
  
! <p>Maintenant commencez par scanner le code � barres du lecteur ou tapez son nom pour trouver leur compte.Lorsque Koha a trouv� un lecteur, vous verrez un nouveau pav� pour scanner ou taper le num�ro identifiant le document (en g�n�ral un code � barres).</p>
  
! <p>Si vous souhaitez que ce document et les documents suivants de cette transaction aient une date de retour autre que la date par d�faut d�finie pour ce type de document utilisez la "date de retour manuelle" pour choisir la date de retour avant de scanner le premier document.</p>
  
! <p>Si le pr�t n'a rien de sp�cial, il sera fait imm�diatement et affich� (avec les autres emprunts du lecteur)en bas de la page.</p>
! <p>Si le pr�t pose probl�me, alors un autre pav� appara�tra (en <b>ROUGE</b>) et vous demandera de confirmer que le pr�t est possible.Si le pr�t est vraiment impossible (par exemple le code � barres n'existe pas), alors vous ne pouvez pas le confirmer.Si le pr�t est possible mais n�cessite confirmation (comme pour un document pr�t� � un autre lecteur, ou un lecteur ayant emprunt� trop de docuements), vous pourrz alors confirmer le pr�t.Si la confirmation implique une autre op�ration (si le document est pr�t� � un autre lecteur, le pr�t� implique que le retour soir fait), alors elle sera aussi effectu�e.</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** returns.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- returns.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,9 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>
  
! <p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>
  
! <p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
! <p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
! <p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,9 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Avant de commencer, il est tr�s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n�cessaire. Cela devra �tre fait seulement la premi�re fois que vous ferez du pr�t (ou des retours) � partir d'un poste de travail, ensuite un cookie du navigateur m�morisera le r�glage correct.</p>
  
! <p>Maintenant scannez simplement ou tapez le num�ro identifiant du document (habituellement un code � barres)dans le pav� propos�.</p>
  
! <p>Le retour est fait et s'il y a quelque chose de particulier sur le document ou l'emprunteur (comme un emprunteur ayant des dettes), un pav� rouge vous en avertira</p>
! <p>Si le document a �t� r�serv� par quelqu'un d'autre, on vous demandera aussi de valider la r�servation.Si vous la confirmez, le document est mis � l'�tat "en attente" et vous devrez avertir le lecteur que le docuement est disponible.</p>
! <p>Si le document est r�serv� par quelqu'un d'un autre site, vous devez aussi valider le transfert</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.4,1.5
Message-ID: <E1CmCGQ-0007PK-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** breeding.tmpl	24 Nov 2004 16:16:53 -0000	1.4
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.5
***************
*** 6,12 ****
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�e</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
--- 6,12 ----
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�es</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import� parce qu'ils ne semblent pas �tre au format MARC (ou n� ISBN/ ISSN manquant) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
***************
*** 14,21 ****
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 		<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 		<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 		<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 14,21 ----
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>S�lectionner un fichier � importer dans le r�servoir.Il sera analys�, et pour chaque ISBN trouv�, une nouvelle copie sera cr�� dans le r�servoir.</li>
! 		<li>Si un ISBN existe d�j� dans le r�servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'�craser l'ancien.</li>
! 		<li>Vous pouvez donner un nom � cette importation. Cela peut �tre utile, lors de la cr�ation d'une notice, pour vous souvenir d'o� vient l'enregistrement MARC propos�!</li>
! 		<li>Bien s�r, si l'ISBN existe d�j� dans la base de donn�es, la notice sera ignor�e.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc search.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PN-45@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/search.marc

Modified Files:
	search.tmpl 
Log Message:
french version for 2.2.0

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 3,27 ****
  	<p>La recherche est divis�e en deux parties diff�rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p> Les champs usuels sont dans la partie haute de l'�cran. Ils contiennent :</p>
  		<ul>
! 			<li>Mot cl� :  Recherche sur l'ensemble</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code Barre : le code barre de la bibloth�que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
! 			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
  		</ul>
  	<p>M�thode de Recherche</p>
  		<ul>
! 			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
! 			<li> Une notice est s�lectionn�e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>inf�rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen�ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignor�</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,27 ----
  	<p>La recherche est divis�e en deux parties diff�rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p>Les champs usuels sont dans la partie haute de l'�cran. Ils contiennent :</p>
  		<ul>
! 			<li>Tous les mots : recherche sur l'ensemble de la notice</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code � Barres : le code � barres de la bibloth�que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Type de document : s�lectionnez ici un type de document. Si aucun n'est s�lectionn�, la recherche est lanc�e sur tous les types</li>
! 			<li>Site : S�lectionnez un site pr�cis.Si vous n'en s�lectionnez aucun, la recherche se fera sur tous les sites</li>
  		</ul>
  	<p>M�thode de Recherche</p>
  		<ul>
! 			<li>Si vous renseignez plus d'un champ, votre recherche sera de type "et" (les notices contenant <b>titre</b> ET <b>auteur</b>)</li>
! 			<li>Une notice est s�lectionn�e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>Si vous saisissez un * (ou un %) � la fin d'un terme, Koha recherche les mots qui commencent par le terme saisi <b>inf�rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen�ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>Dans la partie inf�rieure de l'�cran de recherche, le pav� <b>Plus de champs</b>, vous permet de saisir ce que vous voulez  :  et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>Pour des raisons d'efficacit� l'* est active uniquement si vous entrez un mot d'au moins 3 lettres.pour les mots  de  3 lettres ou moins, l'* est ignor�e <b>ignor�</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/import breeding.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PF-5y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** breeding.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 2,13 ****
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
! <p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
! <p>Choose File to browse.</p>
! <p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract�res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 2,13 ----
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>C'est utile d'importer un paquet de notices iso2709 qui pourront �tre utilis�es plus tard pour un catalogage rapide</p>
! <p>Au pr�alable, vous devez parcourir votre ordinateur pour trouver l'enregistrement MARC que vous avez s�lectionn� pour votre document.Cliquez</p>
! <p>Choisir le dossier � rechercher.</p>
! <p>Si vous n'�tes pas s�r d'avoir d�j� import� un enregistrement laissez le button r�gl� sur</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract�res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : Cet outil n'est PAS pr�vu pour importer de l' iso2709 dans votre Base de Donn�es ACTIVE.Si vous avez besoin de migrer des donn�es � partir d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/bulkmarcimport.pl </b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/export marc.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PM-3g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/export

Modified Files:
	marc.tmpl 
Log Message:
french version for 2.2.0

Index: marc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- marc.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>iso 2709 export</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>export iso2709</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Les enregistrements sont charg�s sur le poste de travail qui a demand� l'exportation et sont sauv�s dans un fichier nomm� "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptBiblioitem.tmpl,1.3,1.4 AcceptItemCopy.tmpl,1.3,1.4 marcimportdetail.tmpl,1.3,1.4
Message-ID: <E1CmCGQ-0007Ps-Mx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/marcimport

Modified Files:
	AcceptBiblioitem.tmpl AcceptItemCopy.tmpl 
	marcimportdetail.tmpl 
Log Message:
french version for 2.2.0

Index: AcceptBiblioitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptBiblioitem.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptBiblioitem.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 8,17 ****
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d�j� dans la Base de Donn�e
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> is already in the database with  biblionumber <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
--- 8,17 ----
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d�j� dans la base de donn�es
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> est d�j� dans la base de donn�es avec le num�ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
***************
*** 26,30 ****
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" -->has been entered into the database with biblionumber  <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
--- 26,30 ----
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> a �t� saisi dans la base de donn�es avec le num�ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
***************
*** 41,45 ****
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE BARRE</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>
--- 41,45 ----
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE A BARRES</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>

Index: AcceptItemCopy.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptItemCopy.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptItemCopy.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 2,6 ****
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code Barre <b><!-- TMPL_VAR NAME="barcode" --></b> a d�j� �t� attribu�</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
--- 2,6 ----
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code � Barres <b><!-- TMPL_VAR NAME="barcode" --></b> a d�j� �t� attribu�</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
***************
*** 10,14 ****
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout� avec code barre <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>
--- 10,14 ----
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout� avec code � barres <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>

Index: marcimportdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marcimportdetail.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- marcimportdetail.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 32,36 ****
  	<tr bgcolor="#ddaaaa"><td>Ann�e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Localisation</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
--- 32,36 ----
  	<tr bgcolor="#ddaaaa"><td>Ann�e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Emplacement</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/barcodes barcodes-bottom.inc,1.1,1.2 barcodes-top.inc,1.1,1.2 barcodes.tmpl,1.1,1.2 printerConfig.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Px-Oj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/barcodes

Modified Files:
	barcodes-bottom.inc barcodes-top.inc barcodes.tmpl 
	printerConfig.tmpl 
Log Message:
french version for 2.2.0

Index: barcodes-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-bottom.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-bottom.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param�tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Bilans</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param�tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 

Index: barcodes-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-top.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-top.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 204,212 ****
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>  <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>  <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>  <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>  <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>  <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>  <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>  <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>  <a class="about" href="/cgi-bin/koha/about.pl">About</a>  <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Funds</a>  <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Auth value</a>  <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thesaurus</a>  <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Currencies</a>  <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->

--- 204,212 ----
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Accueil</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Lecteurs</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit�s</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Param�tres</a> <a class="about" href="/cgi-bin/koha/about.pl">A propos</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Aide</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Cr�dits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2"> Valeurs autoris�es</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Th�saurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->


Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 41,56 ****
  

  <div id="mainbloc">

! 	<h1>G�n�rateur de code-barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G�n�rer le code barre � partir du num�ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>S�lectionner le de code-barres � g�n�rer</li>

  		<li>D�finissez la taille de la page pour le PDF</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

  		</li>

  	</ul>

--- 41,55 ----
  

  <div id="mainbloc">

! 	<h1>G�n�rateur de code � barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G�n�rer le code � barres � partir du num�ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>S�lectionnez une plage pour les num�ros d'inventaire. Vous pouvez s�lectionner une s�rie continue ou une liste de codes disjoints</li>

! 		<li>S�lectionner le style de mod�le pour g�n�rer des codes � barres</li>

  		<li>D�finissez la taille de la page pour le PDF</li>

! 		<li>Koha va afficher la disposition , qui varie suivant la taille de la page, de tous les codes � barres.Vous pouvez d�finir � quel endroit l'impression commence.

  		</li>

  	</ul>

***************
*** 117,121 ****
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code cat�gorie</td>

  						</tr>

  						<tr align="right">

--- 116,120 ----
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code Pays</td>

  						</tr>

  						<tr align="right">


Index: printerConfig.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/printerConfig.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printerConfig.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- printerConfig.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 4,8 ****
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4"> S�lectionner la configuration d'imprimante correspondant � votre environnement</font></td>

  		</tr>

  	</table>

--- 4,8 ----
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">S�lectionner la configuration d'imprimante correspondant � votre environnement</font></td>

  		</tr>

  	</table>

***************
*** 12,17 ****
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>Set margin left and margin bottom of the page that you are going to use. This parameters will

! 		    help to center the barcodes into the labels.</li>

  	</ul>

  	<br>

--- 12,16 ----
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>D�finissez les marges gauches et basses pour la page que vous souhaitez utiliser. Ces param�tres aideront � centrer les codes barres sur les �tiquettes.</li>

  	</ul>

  	<br>

***************
*** 96,100 ****
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer param�tres">

  				</td>

    			</tr>

--- 95,99 ----
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer r�glages">

  				</td>

    			</tr>





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/authorities authorities.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pi-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/authorities

Modified Files:
	authorities.tmpl searchresultlist-auth.tmpl 
	searchresultlist.tmpl 
Log Message:
french version for 2.2.0

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- authorities.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 15,19 ****
  			<input type="button" value="Ajouter une autorit�" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
- <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
  	</p>
  </div>
--- 15,18 ----
***************
*** 134,139 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 133,138 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign�(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	} else {

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist-auth.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 60,64 ****
  			<table>
  				<tr>
! 					<th class="authority">Abr�g�</th>
  					<th class="authority">Utilis�</th>
  					<th class="authority">Le choisir</th>
--- 60,64 ----
  			<table>
  				<tr>
! 					<th class="authority">R�sum�</th>
  					<th class="authority">Utilis�</th>
  					<th class="authority">Le choisir</th>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 35,39 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr�g�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
--- 35,39 ----
  		<table>
  			<tr>
! 				<th class="authority">R�sum�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
***************
*** 46,50 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title="Autorit� num�ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 46,50 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR NAME="authid" -->' title='autorit� num�ro <!-- TMPL_VAR NAME="authid" -->'>
  						</a>
  					</td>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007QW-GW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
french version for 2.2.0

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 400.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 401.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li> Cette erreur signifie que vous n'�tes pas autoris� � visualiser cette page</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que vous n'�tes pas autoris� � visualiser cette page</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 402.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 403.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 404.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 405.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 500.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,19 ****
  <br>
  
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
  <li>Attendez une meilleure version ou envoyez un mail � la maintenance</li>
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,19 ----
  <br>
  
! <li>Dans Koha, ceci signifie normalement, que l'�quipe de Koha travaille � de nouvelles options</li>	
  <li>Attendez une meilleure version ou envoyez un mail � la maintenance</li>
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/bull bull-home.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Q6-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/bull

Modified Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques</h1>
! 	<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  	<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques</h1>
! 	<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  	<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,26 ****
  	<p>Cet �cran est divis� en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
  	<ul>
! 		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
! 		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
! 		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
  	<ul>
! 		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
! 		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
! 		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically</li>
! 		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically.</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
! 	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget & bookseller are defined here).</p>
! 	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,26 ----
  	<p>Cet �cran est divis� en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>La partie droite concerne les parutions.Quand vous cr�er un nouvel abonnement, le 1er num�ro est calcul�e automatiquement.Lorsque vous  voulez/ avez besoin,vous pouvez  d�finir les numeros qui ont un nouveau statut :</p>
  	<ul>
! 		<li>Arriv� : lorqu'un bulletin arrive, vous pouvez le mettre en �tat"arriv�". Le bulletin disparait de la liste et le num�ro est ajout� dans la liste des bulletins arriv�s (� gauche)</li>
! 		<li>En retard : signifie que le document est en retard et devrait �tre arriv�.Un num�ro, qui not� � l'�tat en retard reste dans la liste des bulletins attendus et le  bulletin suivant attendu est g�n�r�</li>
! 		<li>Manquant : signifie que la livraison n'aura jamais lieu.Le num�ro dispara�t de la liste et est ajout� � la liste "Liste des lacunes" (sur la partie gauche)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>Il y a 6 informations diff�rentes dans la partie gauche, qui sont calcul�es automatiquement pour la plupart, mais vous pouvez les changer<p>
  	<ul>
! 		<li>Date de d�but d'abonnement : la date de d�but du premier abonnement.Ne devrait �tre modifi�e et n'est pas modifi� automatiquement lors du renouvellement des abonnements</li>
! 		<li>date de fin d'abonnement : doit �tre entr� manuellement lorsque l'abonnement est d�finitivement clos</li>
! 		<li>Num�ros arriv�s : la liste des num�ros que vous avez dans votre biblioth�que. Automatiquement rempli quand un bulletin est marqu� arriv�. Vous pouvez modifier ce champ manuellement, par exemple pour changer une longue liste (1,2,3,4,...,51) en une plus courte(1-50)</li>
! 		<li>Num�ros manquants : la liste des  num�ros que vous n'avez pas dans votre biblioth�que, et qui n'arriveront jamais (ou qui ont �t� perdus).</li>
! 		<li>note de l'OPAC : le champ qui appara�t � l'OPAC (avec quelques autres informations sur l'abonnement comme la date de d�but et de fin).Ce champ doit �tre rempli manuellement.Rien n'est mis ici automatiquement</li>
! 		<li>Note de l'OPAC : le champ qui appara�t dans l'interface biblioth�caire (avec quelques autres informations sur l'abonnement comme la date de d�but et de fin).Ce champ doit �tre rempli manuellement.Rien n'est mis ici automatiquement</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calcule automatiquement la fin de l'abonnement (� partir de la date de d�but et du nombre d'exemplaires re�us). Lorsqu'un abonnement a pris fin, vous ne pouvez plus changer l'�tat du dernier "exemplaire en attente" (car il n'est plus attendu en fait). Pour pouvoir "recevoir" ce num�ro, vous devez renouveler votre abonnement.</p>
! 	<p>Renouveller un abonnement signifie que vous devez compl�ter quelques informations pour le renouvellement.Lorsque ces informations sont saisies, une suggestion est automatiquement cr��e dans Koha.Cette suggestion peut- �tre g�r�e par la/le biblioth�caire qui commande les livres, comme n'importe quelle autre commande (= budget et fournisseur sont d�finis ici).</p>
! 	<p><i>Noter que le renouvellement de l'abonnement fait par le biblioth�caire responsable des p�riodiques est cens� �tre imm�diat.Nous avons choisi de rendre Koha aussi simple que possible.En fait, le renouvellement de l'abonnement ne peut pas �tre imm�diat, mais nous n'avons pas voulu ajouter trop de complications.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,19 ****
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�� d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 3,19 ----
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth�caire qui a cr�� l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect�.Comporte aussi le titre de la notice concern�e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit �tre rempli : la dur�e de l'abonnement peut �tre calcul�e en semaines, mois ou nombre de num�ros � recevoir</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>Le num�ro des bulletins re�us peut �tre une formule complexe. La formule peut contenir n'importe quel texte et/ou chiffre. <b>{X} {Y}</b> et <b>{Z}</ b> sont particuliers. Vous pouvez les utiliser pour d�finir une formule de calcul. les valeurs de XYZ sont calcul�es de la mani�re suivante :</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>toutes les : le nombre avant peut �tre ajouter � chaque parution ou moins souvent</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Retourner � : si la condition pr�c�dente est valid�e, le num�ro calcul� est fix� � celui-ci � la place</li>
! 				<li>Derni�re valeur/commence avec : la derni�re valeur calcul�e ou la 1�re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 24,30 ****
  		</ul>
  		Donnera les num�ros de parution suivants
! 		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
  		<p>
! 			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 24,30 ----
  		</ul>
  		Donnera les num�ros de parution suivants
! 		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N� 2005/4, N�2006/1</p>
  		<p>
! 			<b>Note:</b>lorsque vous ajoutez un abonnement, Koha consid�re que vous avez d�j� pass� la commande o� que vous allez le faire bient�t.Aussi, AUCUNE information n'est envoy�e vers le module acquisition.Ca n'est pas le cas quand l'abonnement arive � expiration.Dans ce cas,un renouvellement de l'abonnement  cr�e une
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques d�tail</h1>
! 	In this screen, you can see subscription detail, and modify it if you need.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�� d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 1,20 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques d�tail</h1>
! 	Sur cet �cran, vous pouvez voir le d�tail de l'abonnement, et le modifier si n�cessaire.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth�caire qui a cr�� l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect�.Comporte aussi le titre de la notice concern�e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit �tre rempli : la dur�e de l'abonnement peut �tre calcul�e en semaines, mois ou nombre de num�ros � recevoir</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>La num�rotation des exemplaires re�us peut comprendre une formule complexe. La "Formule de num�rotation" peut �tre remplie avec n'importe quel texte et/ ou nombre.<b>{X} {Y}</b> et <b>{Z}</b> peuvent �tre utilis�es pour d�finir la formule de calcul.Les valeurs de XYZ sont calcul�es selon la mani�re suivante</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>toutes les : le nombre avant peut �tre ajouter � chaque parution ou moins souvent</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Retourner � : si la condition pr�c�dente est valid�e, le num�ro calcul� est fix� � celui-ci � la place</li>
! 				<li>Derni�re valeur/commence avec : la derni�re valeur calcul�e ou la 1�re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 23,27 ****
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup�rieur � <b>4</b> Retourner � <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num�ros de parution suivants
! 			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
  		<p>
  		</p>
--- 23,27 ----
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup�rieur � <b>4</b> Retourner � <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num�ros de parution suivants
! 			<b>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N� 2005/4, N�2006/1
  		<p>
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio.tmpl,1.12,1.13 addbooks.tmpl,1.5,1.6 additem-nomarc.tmpl,1.3,1.4 additem.tmpl,1.8,1.9 isbnsearch.tmpl,1.4,1.5 marcimport.tmpl,1.4,1.5
Message-ID: <E1CmCGR-0007QJ-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui.simple

Modified Files:
	addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl 
	isbnsearch.tmpl marcimport.tmpl 
Log Message:
french version for 2.2.0

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** addbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.12
--- addbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.13
***************
*** 57,61 ****
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate"> Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice � nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> � partir de cette notice</p>
  				</ul>
--- 57,61 ----
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice � nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> � partir de cette notice</p>
  				</ul>
***************
*** 455,460 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 455,460 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign�(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	} else {

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** addbooks.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- addbooks.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 1,5 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv�(s)</font>
--- 1,5 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv�(s)</font>
***************
*** 11,21 ****
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="acquisition"> Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button acquisition"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button acquisition">Cr�er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
--- 11,21 ----
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="catalogue">Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button catalogue"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Cr�er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
***************
*** 27,40 ****
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr�er une nouvelle notice" class="button acquisition">
! 				</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="acquisition">Optimisation</h2>
! 		<p>If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.<br/>
! 				If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.<br/>
! 				Sinon, une notice peut-�tre ajout� � partir de z�ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 27,41 ----
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr�er une nouvelle notice" class="button catalogue">
! 				</form>
! 			</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Optimisation</h2>
! 		<p>Si l'ISBN ou le titre est trouv� dans la table il peut �tre r�cup�r� puis modifi�<br/>
! 				Si l'ISBN ou le titre est trouv� dans le r�servoir, il sera r�cup�r� et une notice sera rajout�e<br/>
! 				Sinon, une notice peut-�tre ajout�e en partant de z�ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem-nomarc.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- additem-nomarc.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code barre � l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code � barres � l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D�sol�, ce code barre est d�j� utilis�</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D�sol�, ce code � barres est d�j� utilis�</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
***************
*** 29,33 ****
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Localisation</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
--- 29,33 ----
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Emplacement</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
***************
*** 44,48 ****
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code Barre de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>
--- 44,48 ----
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code � Barres de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** additem.tmpl	24 Nov 2004 16:11:16 -0000	1.8
--- additem.tmpl	5 Jan 2005 14:35:18 -0000	1.9
***************
*** 46,53 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code barre d�j� utilis�!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un ouvrage" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
--- 46,53 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code � barres d�j� utilis�!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un document" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
***************
*** 95,99 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	}
--- 95,99 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	}
***************
*** 104,108 ****
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l'ouvrage ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
--- 104,108 ----
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l exemplaire ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** isbnsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- isbnsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 1,7 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">R�sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="acquisition">Vous recherchiez <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></b></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r�ponses</p>
--- 1,7 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">R�sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="catalogue">Vous recherchiez <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r�ponses</p>
***************
*** 10,20 ****
  	</div>
  	<div id="bloc100">
! 		<h2 class="acquisition">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="acquisition">Titre</th>
! 				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">&copier;</th>
! 				<th class="acquisition">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
--- 10,20 ----
  	</div>
  	<div id="bloc100">
! 		<h2 class="catalogue">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="catalogue">Titre</th>
! 				<th class="catalogue">Auteur</th>
! 				<th class="catalogue">&copier;</th>
! 				<th class="catalogue">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
***************
*** 25,31 ****
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ajouter des ouvrages</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
--- 25,31 ----
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ajouter des documents</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
***************
*** 61,65 ****
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="acquisition">Notices dans le r�servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 61,65 ----
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="catalogue">Notices dans le r�servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 91,97 ****
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
--- 91,103 ----
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<select name="frameworkcode">
! 				<option value="">Par d�faut</option>
! 				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
! 					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
! 				<!-- /TMPL_LOOP -->
! 			</select>
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 99,101 ****
  	
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 105,107 ----
  	
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** marcimport.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- marcimport.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 12,18 ****
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�e</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
--- 12,18 ----
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�es</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import� parce qu'ils ne semblent pas �tre au format MARC (ou n� ISBN/ ISSN manquant) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
***************
*** 20,27 ****
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 	<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 	<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 20,27 ----
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>S�lectionner un fichier � importer dans le r�servoir.Il sera analys�, et pour chaque ISBN trouv�, une nouvelle copie sera cr�� dans le r�servoir.</li>
! 	<li>Si un ISBN existe d�j� dans le r�servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'�craser l'ancien.</li>
! 	<li>Vous pouvez donner un nom � cette importation. Cela peut �tre utile, lors de la cr�ation d'une notice, pour vous souvenir d'o� vient l'enregistrement MARC propos�!</li>
! 	<li>Bien s�r, si l'ISBN existe d�j� dans la base de donn�es, la notice sera ignor�e.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bull receipt-search-result.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2 serial-issues.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2 subscription-renew.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Qg-MN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bull

Modified Files:
	receipt-search-result.tmpl result.tmpl search.tmpl 
	searchresultlist.tmpl serial-issues.tmpl statecollection.tmpl 
	subscription-add.tmpl subscription-detail.tmpl 
	subscription-renew.tmpl 
Log Message:
french version for 2.2.0

Index: receipt-search-result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/receipt-search-result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** receipt-search-result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- receipt-search-result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 36,40 ****
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title='Num�ro du p�riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>
--- 36,40 ----
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR name="authid" -->' title='Num�ro du p�riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 			<th class="catalogue">Abr�g�</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
--- 31,35 ----
  		<table>
  			<tr>
! 			<th class="catalogue">R�sum�</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
***************
*** 48,56 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- 					<!-- TMPL_UNLESS NAME="norequests" -->
  						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Le choisir</a>
- 					<!-- TMPL_ELSE -->
- 						Non R�servable
- 					<!-- /TMPL_UNLESS -->
  				</td>
  			</tr>
--- 48,52 ----

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 11,15 ****
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Mot cl�</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 11,15 ----
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Tous les mots</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr�g�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
--- 31,35 ----
  		<table>
  			<tr>
! 				<th class="authority">R�sum�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
***************
*** 42,46 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title="Autorit� num�ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 42,46 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR name="authid" -->' title='Autorit� num�ro <!-- TMPL_VAR name="authid" -->'>
  						</a>
  					</td>

Index: serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** serial-issues.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- serial-issues.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 68,72 ****
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> pr�ts<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->
--- 68,72 ----
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> sorties<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 3,32 ****
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour</h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
- 	<h2 class="bull">R�sum� d'abonnement</h2>
- 	<form method="post" name="f" action="statecollection.pl">
- 		<input type="hidden" name="op" value="modsubscriptionhistory">
- 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
- 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
- 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
- 		<p><label>Biblioth�caire</label><!-- TMPL_VAR name="user" --></p>
- 		<p><label>Date de d�but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
- 		<p><label>Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
- 		<p>N� Arriv�s</p>
- 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
- 		<p>Num�ros enregistr�s</p>
- 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
- 		<p>Remarque de l'OPAC</p>
- 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
- 		<p>Note interne</p>
- 		<p>&nbsp;<textarea name="librariannote" COLS=60 ROWS=5><!-- TMPL_VAR name="librariannote" --></textarea></p>
- 		<input type="submit" value="Enregistrer les changements" class="button bull">
- 	</form>
- </div>
- 
- <div id="bloc25">
  <h2 class="bull">Num�ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
--- 3,10 ----
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
  <h2 class="bull">Num�ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
***************
*** 83,92 ****
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="button bull">Renew</a> your subscription</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! </form>
  </table>
  <script language="JavaScript" type="text/javascript">
--- 61,89 ----
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>L'abonnement a expir�.L'�tat du prochain numero attendu ne peut-�tre chang�. <a href="#" onClick="popup()" class="button bull">Renouveller</a>votre abonnement</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! <div id="bloc25">
! 	<h2 class="bull">R�sum� d'abonnement</h2>
! 	<form method="post" name="f" action="statecollection.pl">
! 		<input type="hidden" name="op" value="modsubscriptionhistory">
! 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
! 		<p><label>Biblioth�caire</label><!-- TMPL_VAR name="user" --></p>
! 		<p><label class="label100">Date de d�but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
! 		<p><label class="label100">Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
! 		<p>Bulletins re�us</p>
! 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
! 		<p>Bulletins manquants</p>
! 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
! 		<p>Remarque de l'OPAC</p>
! 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
! 		<input type="submit" value="Enregistrer les changements" class="button bull">
! 	</form>
! </div>
! 
  </table>
  <script language="JavaScript" type="text/javascript">

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 21,26 ****
  		<p class="problem">attention</p>
  		<ul>
! 			<li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
! 			<li>You also must have selected a supplier if you want to ask for late issues</li>
  		</ul>
  </div>
--- 21,26 ----
  		<p class="problem">attention</p>
  		<ul>
! 			<li>Souvenez vous que vous <b>devez</b> avoir cr�� une notice <b>avant</b> de cr�er un abonnement</li>
! 			<li>Vous devez s�lectionner un fournisseur si vous souhaitez r�clamer les num�ros en retard</li>
  		</ul>
  </div>
***************
*** 129,133 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�� d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>
--- 129,133 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�e d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 76,80 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�� d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>
--- 76,80 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�e d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-renew.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 13,17 ****
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p> Remarque pour le biblioth�caire qui va g�rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">
--- 13,17 ----
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Remarque pour le biblioth�caire qui va g�rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members jmemberentry.tmpl,1.9,1.10 member-flags.tmpl,1.2,1.3 member-password.tmpl,1.5,1.6 member.tmpl,1.10,1.11 memberentry.tmpl,1.12,1.13 members-home.tmpl,1.7,1.8 moremember.tmpl,1.16,1.17 newjmember.tmpl,1.2,1.3 newmember.tmpl,1.2,1.3 readingrec.tmpl,1.5,1.6
Message-ID: <E1CmCGS-0007Qu-35@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/members

Modified Files:
	jmemberentry.tmpl member-flags.tmpl member-password.tmpl 
	member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl 
	newjmember.tmpl newmember.tmpl readingrec.tmpl 
Log Message:
french version for 2.2.0

Index: jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** jmemberentry.tmpl	24 Nov 2004 16:17:14 -0000	1.9
--- jmemberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.10
***************
*** 74,78 ****
  		</tr>
  		<tr>
! 			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
  		<tr>
  			<td>Champ de tri 1</td>
--- 74,78 ----
  		</tr>
  		<tr>
! 			<td colspan="5">Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent �tre utiles pour des besoins statistiques.</td>
  		<tr>
  			<td>Champ de tri 1</td>

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- member-flags.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations</div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>
--- 2,6 ----
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations pour <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member-password.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- member-password.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 7,11 ****
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				You have entered a UserID that already exists.  Please choose another one.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
--- 7,11 ----
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				Vous avez saisi un nom d'utilisateur qui existe d�j�. Merci de choisir un autre nom.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** member.tmpl	24 Nov 2004 16:17:14 -0000	1.10
--- member.tmpl	5 Jan 2005 14:35:21 -0000	1.11
***************
*** 43,47 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 43,47 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** memberentry.tmpl	15 Dec 2004 22:11:52 -0000	1.12
--- memberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.13
***************
*** 2,129 ****
  
  <div id="mainbloc">
!  <!-- TMPL_IF NAME="addAction" -->
!  <h1>
!   Ajouter une inscription
!  </h1>
!  <!-- TMPL_ELSE -->
!  <h1>
!   Mettre � jour les d�tails-lecteur
!  </h1>
!  <!-- /TMPL_IF -->
! 
!  <!-- TMPL_IF Name="NOK" -->
!   <h1>ERREUR</h1>
!   <div id="problem">
!    <p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK � nouveau :</p>
!    <!-- TMPL_IF NAME="ERROR_cardnumber" -->
!     Num�ro de Carte<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
!     N� de carte invalide<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_gender" -->
!     Sexe<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_firstname" -->
!     Pr�noms<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_surname" -->
!     Nom de famille<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="aERROR_ddress" -->
!     Rue de l'adresse<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_city" -->
!     Ville (Code Postal)<br>
!    <!-- /TMPL_IF -->
!   </div>
!  <!-- /TMPL_IF -->
!  <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
!   <input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
!   <input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
!   <input type="hidden" name="type" value="borrowers">
!   <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
!   <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
!   <!-- TMPL_IF NAME="addAction" -->
!    <input type="hidden" name="op" value="add">
!   <!-- TMPL_ELSE -->
!    <input type="hidden" name="op" value="modify">
!   <!-- /TMPL_IF -->
!   <table>
!    <tr>
!     <td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num�ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
!    </tr>
!    <tr>
!     <th colspan="5">DETAILS PERSONNELS DU LECTEUR</th>
!    </tr>
!    <tr>
!     <td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" --><b> Pr�noms</b><!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit�</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Nom pr�f�rentiel<!-- /TMPL_UNLESS --></td>
!    </tr>
!    <tr>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!     <!-- TMPL_VAR NAME="Mr" -->
!     <select name="title">
!      <option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
!      <option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
!      <option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
!      <option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
!      <option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
!      <option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
!      <option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
!     </select>
!     <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!    </tr>
! 
!    <tr>
!     <td colspan="2">
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
!     <!-- /TMPL_UNLESS -->
! 
!     </td>
!     <td colspan="2">
!      <!-- TMPL_UNLESS name="institution" -->
!      Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      Cat�gorie  <!-- TMPL_VAR NAME="catcodepopup" -->
!     </td>
!    </tr>
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <!-- TMPL_VAR NAME="ethcatpopup" -->
!      <td colspan="2">Ethnie</td>
!      <td colspan="2">Note d'ethnie</td>
!     </tr>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <td colspan="2">
!       <!-- TMPL_IF NAME="ethcatpopup" -->
!        <select name="ethnicity" size="1">
!         <!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
--- 2,129 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_IF NAME="addAction" -->
! 	<h1>
! 		Ajouter <!-- TMPL_IF NAME="institution" -->Nom de la Collectivit� <!-- /TMPL_IF -->Lecteur
! 	</h1>
! 	<!-- TMPL_ELSE -->
! 	<h1>
! 		Mettre � jour les d�tails-lecteur
! 	</h1>
! 	<!-- /TMPL_IF -->
! 
! 	<!-- TMPL_IF Name="NOK" -->
! 		<h1>ERREUR</h1>
! 		<div id="problem">
! 			<p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK � nouveau :</p>
! 			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
! 				Num�ro de Carte<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
! 				N� de carte invalide<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_gender" -->
! 				Sexe<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_firstname" -->
! 				Pr�noms<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_surname" -->
! 				Nom de famille<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="aERROR_ddress" -->
! 				Rue de l'adresse<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_city" -->
! 				Ville (Code Postal)<br>
! 			<!-- /TMPL_IF -->
! 		</div>
! 	<!-- /TMPL_IF -->
! 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
! 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
! 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
! 		<input type="hidden" name="type" value="borrowers">
! 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
! 		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
! 		<!-- TMPL_IF NAME="addAction" -->
! 			<input type="hidden" name="op" value="add">
! 		<!-- TMPL_ELSE -->
! 			<input type="hidden" name="op" value="modify">
! 		<!-- /TMPL_IF -->
! 		<table>
! 			<tr>
! 				<td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num�ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
! 			</tr>
! 			<tr>
! 				<th colspan="5">NOUVEAU LECTEUR <!-- TMPL_UNLESS name="institution" -->DETAILS PERSONNELS<!-- /TMPL_UNLESS --> DETAILS DU CONTACT</th>
! 			</tr>
! 			<tr>
! 				<td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" --><b> Pr�noms</b><!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit�</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Nom usuel<!-- /TMPL_UNLESS --></td>
! 			</tr>
! 			<tr>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 				<!-- TMPL_VAR NAME="Mr" -->
! 				<select name="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
! 					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
! 					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
! 					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
! 					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
! 					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
! 					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
! 				</select>
! 				<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td colspan="2">
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
! 				<!-- /TMPL_UNLESS -->
! 
! 				</td>
! 				<td colspan="2">
! 					<!-- TMPL_UNLESS name="institution" -->
! 					Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					Categorie <!-- TMPL_VAR NAME="catcodepopup" -->
! 				</td>
! 			</tr>
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<!-- TMPL_VAR NAME="ethcatpopup" -->
! 					<td colspan="2">Ethnie</td>
! 					<td colspan="2">Note d'ethnie</td>
! 				</tr>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<td colspan="2">
! 						<!-- TMPL_IF NAME="ethcatpopup" -->
! 							<select name="ethnicity" size="1">
! 								<!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
***************
*** 164,168 ****
  
  			<tr>
! 				<td colspan="2">Adresse municipale, si diff�rente</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
--- 164,168 ----
  
  			<tr>
! 				<td colspan="2">Autre adresse</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
***************
*** 208,212 ****
  
  			<tr>
! 				<td colspan="3">Full Name</td>
  				<td>T�l�phone</td>
  					<td>Relation</td>
--- 208,212 ----
  
  			<tr>
! 				<td colspan="3">Nom</td>
  				<td>T�l�phone</td>
  					<td>Relation</td>
***************
*** 239,243 ****
  			</tr>
  			<tr>
! 				<td>Note de circulation (appara�t durant le pr�t/retour)</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
--- 239,243 ----
  			</tr>
  			<tr>
! 				<td>Note de pr�t (appara�t pendant les sortie/retour</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
***************
*** 258,276 ****
  				<td>Champ de tri 1</td>
  				<td colspan="4">
!      <input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
!     </td>
!    </tr>
!    <tr>
!     <td>Champ de tri 2</td>
!     <td colspan="4">
!      <input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
!     </td>
!    </tr>
! 
!    <tr>
!     <td></td>
!     <td>
!      <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
!      <input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>
--- 258,276 ----
  				<td>Champ de tri 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 				</td>
! 			</tr>
! 			<tr>
! 				<td>Champ de tri 2</td>
! 				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td></td>
! 				<td>
! 					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
! 					<input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>

Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** members-home.tmpl	24 Nov 2004 16:17:14 -0000	1.7
--- members-home.tmpl	5 Jan 2005 14:35:21 -0000	1.8
***************
*** 8,17 ****
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
! 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Parcourir les Membres</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
--- 8,17 ----
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Prolonger des pr�ts, visualiser,ajouter, modifier, supprimer des enregistrements,tout cela en commen�ant par cette recherche</p>
! 		<p>Saisissez le nom du lecteur, une partie du nom, ou un code num�rique dans le champ ci-dessus et appuyez sur la touche Entr�e pour lancer la recherche</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Naviguer dans les lecteurs</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** moremember.tmpl	24 Nov 2004 16:17:14 -0000	1.16
--- moremember.tmpl	5 Jan 2005 14:35:21 -0000	1.17
***************
*** 8,12 ****
  		<p>Num�ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" -->: ,  <br>
  		T�l�phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T�l�phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
--- 8,12 ----
  		<p>Num�ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		T�l�phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T�l�phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
***************
*** 26,30 ****
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe<br>
  			Autre
  		<!-- /TMPL_UNLESS -->
--- 26,30 ----
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe <!-- TMPL_VAR NAME="sex" --><br>
  			Autre
  		<!-- /TMPL_UNLESS -->
***************
*** 165,169 ****
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Droits de pr�t</th>
  				<th>Renouvellement</th>
  			</tr>
--- 165,169 ----
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Frais</th>
  				<th>Renouvellement</th>
  			</tr>

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newjmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newjmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 		<!-- TMPL_VAR NAME="string" -->
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
--- 2,13 ----
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 	<h3>Les champs suivants sont incorrects. Cliquez sur "retour" et corrigez les.</h3>
! 	<ul>
! 		<!-- TMPL_IF NAME="cardnumber_missing" --><li>Merci d'entrer le num�ro de carte lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="firstname_missing" --><li>Merci d'entrer le nom du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="surname_missing" --><li>Merci d'entrer le pr�nom du lecteur.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="dob_missing" --><li>Merci de saisir la date de naissance du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gender_missing" --><li>Merci d'entrer le sexe du lecteur.</li><!-- /TMPL_IF -->
! 	</ul>
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
***************
*** 42,45 ****
--- 49,60 ----
  					<tr valign="top" bgcolor="white" >
  						<td>
+ 						<b>Barcode Number</b>
+ 						</td>
+ 						<td>
+ 						<!-- TMPL_VAR NAME="cardchild" -->
+ 						</td>
+ 					</tr>					
+ 					<tr valign="top" bgcolor="white" >
+ 						<td>
  						<b>Date de naissance</b>
  						</td>

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 228,232 ****
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num�ro de Carte<br/>
--- 228,232 ----
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>Les champs suivants ont des valeurs interdites. Merci de cliquer sur le bouton retour et de r�essayer : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num�ro de Carte<br/>

Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** readingrec.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- readingrec.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  	
  	<!-- TMPL_IF NAME="showfulllink" -->
+ 	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Voir les 50 derniers seulement</a></p><!-- TMPL_ELSE -->
  	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Sortie compl�te</a></p>
  	<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.5,1.6 acquire.tmpl,1.3,1.4 basket.tmpl,1.7,1.8 histsearch.tmpl,1.1,1.2 newbasket2.tmpl,1.6,1.7 newbiblio.tmpl,1.7,1.8 recieve.tmpl,1.3,1.4 suggestion-select.tmpl,1.1,1.2 supplier.tmpl,1.6,1.7
Message-ID: <E1CmCGR-0007Qk-OI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl histsearch.tmpl 
	newbasket2.tmpl newbiblio.tmpl recieve.tmpl 
	suggestion-select.tmpl supplier.tmpl 
Log Message:
french version for 2.2.0

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acqui-home.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- acqui-home.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 39,43 ****
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets</h2>
  		<table class="noborder">
  			<tr>
--- 39,43 ----
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets et lignes de cr�dit</h2>
  		<table class="noborder">
  			<tr>
***************
*** 66,70 ****
  		</table>
  		<p>
! 		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
  	</form>
--- 66,70 ----
  		</table>
  		<p>
! 		Utilisez le bouton rafra�chir pour avoir les chiffres les plus r�cents.Les chiffres communiqu�s le sont � titre indicatif, dans la mesure o� des taux de change affecteront le montant r�ellement pay�.
  		</p>
  	</form>
***************
*** 74,81 ****
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</p>
! 		<p>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </p>
! 		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.</p>
! 		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
  	</ul>
  </div>
--- 74,81 ----
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>Pour d�buter une acquisition, que �a soit une commande, un achat direct ou un don, rechercher tout d'abord le fournisseur, Ajoutez en un si n�cessaire.</p>
! 		<p>Puis s�lectionnez un panier d'achat pr�c�dent ou cr�ez en un nouveau. Notez que le panier d'achat sera attach� � l'utilisateur sous lequel vous �tes logg�. </p>
! 		<p>Pour commander un document vous avez besoin de d�terminer si une notice existe d�j�, puis soit ajouter un exemplaire, soit cr�er une nouvelle notice et y ajouter l'exemplaire</p>
! 		<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez en dessus, et cliquez alors sur "confirmer le panier".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acquire.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- acquire.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 35,39 ****
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p> Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
--- 35,39 ----
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p>Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
***************
*** 41,45 ****
  			</p>
  			<p>
! 				<label class="label100">Code Barre de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
--- 41,45 ----
  			</p>
  			<p>
! 				<label class="label100">Code � Barres de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
***************
*** 48,52 ****
  			<h2 class="acquisition">D�tails de comptabilit�</h2>
  			<p>
! 				<label class="label100">Budget</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
--- 48,52 ----
  			<h2 class="acquisition">D�tails de comptabilit�</h2>
  			<p>
! 				<label class="label100">Ligne de cr�dit</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
***************
*** 70,74 ****
  			<p>
  				<label class="label100">Co�t r�el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
  			</p>
  			<p>
--- 70,74 ----
  			<p>
  				<label class="label100">Co�t r�el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
  			</p>
  			<p>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** basket.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- basket.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 28,32 ****
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">rrp</th>
  				<th class="acquisition">estim�</th>
  				<th class="acquisition">QT�</th>
--- 28,32 ----
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">HT</th>
  				<th class="acquisition">estim�</th>
  				<th class="acquisition">QT�</th>
***************
*** 39,43 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
--- 39,47 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
! 					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- histsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Ordre des r�ponses</h1>
  	<table>
  		<tr>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Recherche sur les commandes</h1>
  	<table>
  		<tr>

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbasket2.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- newbasket2.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat pour <!-- TMPL_VAR name="basketno" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat <!-- TMPL_VAR name="basketno" --> pour <!-- TMPL_VAR NAME="bookselname" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- newbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 74,78 ****
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp�cifier � partir d'une suggestion<!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
--- 74,78 ----
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp�cifi� � partir de la suggestion #<!-- TMPL_VAR NAME="suggestionid" --><!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
***************
*** 81,97 ****
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<input type="text" size="30" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" >
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
  		</p>
  		<p>
--- 81,113 ----
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 101,109 ****
  		<p>
  			<label class="label100">ISBN</label>
! 			<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
  		</p>
  		<p>
  			<label class="label100">P�riodique</label>
! 			<input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
  		</p>
  		<p>
--- 117,133 ----
  		<p>
  			<label class="label100">ISBN</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">P�riodique</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 119,123 ****
  		</p>
  		<p>
! 			<label class="label100">Budget</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Ligne de cr�dit</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
***************
*** 153,157 ****
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>
--- 177,181 ----
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent �tre utiles pour des besoins statistiques.</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieve.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- recieve.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 66,70 ****
  			<b>AIDE</b>
  			<br>
! 			The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>
--- 66,70 ----
  			<b>AIDE</b>
  			<br>
! 			Le total en bas de la page devra �tre proche de quelques centimes du total de la facture.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>

Index: suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/suggestion-select.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** suggestion-select.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- suggestion-select.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 30,34 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
--- 30,34 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** supplier.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- supplier.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 104,108 ****
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des ouvrages incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>
--- 104,108 ----
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des documents incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/barcodes - New directory
Message-ID: <E1CmCHf-0007Xx-MQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/barcodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/authorities - New directory
Message-ID: <E1CmCHf-0007Xu-LB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/help - New directory
Message-ID: <E1CmCHg-0007YJ-4i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bookshelves - New directory
Message-ID: <E1CmCHf-0007Y1-QF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bookshelves

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/suggestion - New directory
Message-ID: <E1CmCHg-0007YV-6z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/z3950 - New directory
Message-ID: <E1CmCHg-0007YY-9e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/z3950

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950 added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/errors - New directory
Message-ID: <E1CmCHf-0007YB-Vd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bull - New directory
Message-ID: <E1CmCHf-0007Y5-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/import - New directory
Message-ID: <E1CmCHg-0007YR-5p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/import

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:41:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:41:53 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.5,1.6 default_intranet_fr_FR.po,1.4,1.5
Message-ID: <E1CmCMD-0007mZ-T4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29858/misc/translator/po

Modified Files:
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** css_opac_fr_FR.po	8 Dec 2004 10:36:03 -0000	1.5
--- css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
***************
*** 36,40 ****
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s livres)"
  
  #. %1$s: TMPL_VAR name=title 
--- 36,40 ----
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s documents)"
  
  #. %1$s: TMPL_VAR name=title 
***************
*** 49,53 ****
  #, c-format
  msgid "%s (hm)"
! msgstr "%s (maison)"
  
  #. For the first occurrence, 
--- 49,53 ----
  #, c-format
  msgid "%s (hm)"
! msgstr "%s(domicile)"
  
  #. For the first occurrence, 
***************
*** 110,114 ****
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s livres)"
  
  #. %1$s: TMPL_VAR name=author 
--- 110,114 ----
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s documents)"
  
  #. %1$s: TMPL_VAR name=author 
***************
*** 145,149 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "<<Pr�d�cent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
--- 145,149 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "Pr�c�dent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
***************
*** 266,270 ****
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour avoir des fonctionnalit�s personnelles"
  
  #. %1$s: TMPL_VAR name=issues 
--- 266,270 ----
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour acc�der � votre dossier personnel"
  
  #. %1$s: TMPL_VAR name=issues 
***************
*** 272,276 ****
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 272,276 ----
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Total des pr�ts:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 278,282 ****
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Autre auteur :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 278,282 ----
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Auteur secondaire :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 284,288 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Autres auteurs :</b>%s"
  
  #. For the first occurrence, 
--- 284,289 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
***************
*** 340,344 ****
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
--- 341,345 ----
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Site actuel :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
***************
*** 346,350 ****
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
--- 347,351 ----
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Date de publication :</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
***************
*** 370,374 ****
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
--- 371,375 ----
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "</b> %s'><b>Site d'origine:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
***************
*** 390,394 ****
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 391,395 ----
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Illus:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 402,406 ****
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b>Type de document : </b>%s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 403,407 ----
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b> Document perdu :</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 422,426 ****
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=card1 
--- 423,427 ----
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Dernier emprunteur 1:</b> %s "
  
  #. %1$s: TMPL_VAR name=card1 
***************
*** 428,432 ****
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=timestamp0 
--- 429,433 ----
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Dernier emprunteur 2:</b> %s "
  
  #. %1$s: TMPL_VAR name=timestamp0 
***************
*** 434,438 ****
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=datelastseen 
--- 435,439 ----
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Dernier emprunteur :</b> %s "
  
  #. %1$s: TMPL_VAR name=datelastseen 
***************
*** 440,444 ****
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
--- 441,445 ----
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Vu le :</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
***************
*** 446,450 ****
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
--- 447,451 ----
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Dur�e du pr�t:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
***************
*** 452,456 ****
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. For the first occurrence, 
--- 453,457 ----
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "</b> %s'><b>Nbre. d'exemplaires:</b> %s"
  
  #. For the first occurrence, 
***************
*** 468,472 ****
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
--- 469,473 ----
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Pages:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
***************
*** 474,478 ****
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
--- 475,479 ----
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Pay� pour:</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
***************
*** 480,484 ****
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
--- 481,485 ----
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Emplacement:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
***************
*** 492,496 ****
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>publi� par :</b>%s"
  
  #. %1$s: TMPL_VAR name=renewals 
--- 493,497 ----
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>Editeur:</b> %s"
  
  #. %1$s: TMPL_VAR name=renewals 
***************
*** 498,502 ****
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
--- 499,503 ----
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Renouvellements:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
***************
*** 504,508 ****
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
--- 505,509 ----
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Frais de location:</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
***************
*** 510,514 ****
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Collection:</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
--- 511,515 ----
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Prix de Remplacement :</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
***************
*** 516,520 ****
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Serial:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
--- 517,521 ----
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Colection:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
***************
*** 741,745 ****
  #, c-format
  msgid "BARCODE %s"
! msgstr "code barre %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
--- 742,746 ----
  #, c-format
  msgid "BARCODE %s"
! msgstr "CODE A BARRES %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
***************
*** 751,760 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour � la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "code barre"
  
  #. SCRIPT 
--- 752,761 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour � la notice"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "Code � barres"
  
  #. SCRIPT 
***************
*** 772,788 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de Biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Rayons"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Annexe"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Annexes"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
--- 773,789 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Etag�res"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Site"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Sites"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
***************
*** 959,963 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filter sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 960,964 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filtrer sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Aide"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
--- 987,991 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Conseils"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
***************
*** 1019,1023 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % � la fin du mot. Par exemple, \"deux tours\" retournera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1020,1024 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % � la fin du mot. Par exemple, \"deux tours\" donnera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1035,1039 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Bulletins"
  
  #. %1$s: TMPL_VAR name=startdate 
--- 1036,1040 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Abr�g� des num�ros"
  
  #. %1$s: TMPL_VAR name=startdate 
***************
*** 1041,1066 ****
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D�butant le <b>%s</b> et un num�ro chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
--- 1042,1067 ----
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D�butant le <b>%s</b> et paraissant chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Exemplaire"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre d'exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "Code � barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "Exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
***************
*** 1344,1348 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "ann�e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
--- 1345,1349 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "Ann�e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
***************
*** 1375,1379 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Command� par la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
--- 1376,1380 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Re�u par la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
***************
*** 1475,1479 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S�lectionnez une annexe si vous voulez limiter votre recherche � une annexe sp�cifique. Par d�faut, la recherche sera faite sur toutes les annexes de la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
--- 1476,1480 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S�lectionnez une annexe si vous voulez limiter votre recherche � un site ne particulier. Par d�faut, la recherche sera faite sur tous les sites de la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
***************
*** 1523,1527 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D�sol�, Koha ne pense pas que vous pouvez acc�der � cette page"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
--- 1524,1528 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D�sol�, Koha pense que vous ne pouvez pas acc�der � cette page."
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
***************
*** 1577,1581 ****
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information de souscription pour %s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
--- 1578,1582 ----
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information d'abonnement pour%s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
***************
*** 1599,1603 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
--- 1600,1604 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
***************
*** 1702,1706 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
--- 1703,1707 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Voir et g�rer les suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
***************
*** 1777,1781 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou un mot de document invalide, merci de r�essayer"
  
  #. %1$s: TMPL_VAR name=issues_count 
--- 1778,1782 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou mot de passe invalide, merci de r�essayer."
  
  #. %1$s: TMPL_VAR name=issues_count 
***************
*** 1827,1831 ****
  #
  msgid "Your biblio basket"
! msgstr "Panier de Biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1828,1832 ----
  #
  msgid "Your biblio basket"
! msgstr "Votre panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1845,1849 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
--- 1846,1850 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code � barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** default_intranet_fr_FR.po	8 Dec 2004 10:36:04 -0000	1.4
--- default_intranet_fr_FR.po	5 Jan 2005 14:41:50 -0000	1.5
***************
*** 1,10449 ****
  # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
! "PO-Revision-Date: 2004-11-24 15:06+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
[...22711 lines suppressed...]
  
! #. SCRIPT
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:54
  msgid "word missing"
  msgstr "mot manquant"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
  msgstr "ann�e"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
  msgid "z3950 search"
  msgstr "Recherche Z39.50"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
! msgid ""
! "|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. "
! "200i}{ / 200f}{ ; 200g}|"
  msgstr ""
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:42:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:42:13 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,1.1,1.2
Message-ID: <E1CmCMX-0007o6-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29975/misc/translator

Modified Files:
	rebuild_lang.sh 
Log Message:


Index: rebuild_lang.sh
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/rebuild_lang.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** rebuild_lang.sh	3 Jan 2005 16:30:13 -0000	1.1
--- rebuild_lang.sh	5 Jan 2005 14:42:03 -0000	1.2
***************
*** 3,9 ****
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW
  
! ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR
--- 3,9 ----
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/zh-TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh-TW
  
! # ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es




From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig - New directory
Message-ID: <E1CmDLr-0002Zv-KQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/labelConfig

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes - New directory
Message-ID: <E1CmDLr-0002Zs-JV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/countryCodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-barcodes-close.inc,NONE,1.1
Message-ID: <E1CmDLW-0002YW-Ia@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9811/koha-tmpl/intranet-tmpl/npl/en/includes

Added Files:
	doc-head-barcodes-close.inc 
Log Message:
Required for barcode generator

--- NEW FILE ---
</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
<style type="text/css"> 
	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
</style>
<style>
.parameters {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
a.parameters:hover {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
.ranges {
	border:0;
}

.myTable TD{
  border-width: 0px;
  border-color: navy;
  border-style: solid;
}

.panel { 
	position:relative;
}

.countryPanel {
	z-index:1;
	width:300px;
	display:none;
	border:1px solid #000000;
	padding:0px;
}
</style>


<script type="text/javascript">
	// Captura el evento onmousemove para cualquier navegador
	if (document.layers) { // Netscape
		document.captureEvents(Event.MOUSEMOVE);
	    document.onmousemove = captureMousePosition;
	} else if (document.all) { // Internet Explorer
	    document.onmousemove = captureMousePosition;
	} else if (document.getElementById) { // Netcsape 6
	    document.onmousemove = captureMousePosition;
	}

	var mouseXMax = 0;
	var mouseYMax = 0;
	var mouseX = 0;
	var mouseY = 0;

	function captureMousePosition(e) {
	    if (document.layers) {
		    mouseX = e.pageX;
			mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
		    mouseYMax = window.innerHeight + window.pageYOffset;
	    } else if (document.all) {
		    mouseX = window.event.x + document.body.scrollLeft;
	        mouseY = window.event.y + document.body.scrollTop;
	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
	    } else if (document.getElementById) {
	        mouseX = e.pageX;
		    mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
	        mouseYMax = window.innerHeight + window.pageYOffset;
	    }
	}

/* Devuelve true si el explorador es Internet Explorer */
var IE = document.all?true:false;

function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}

function correctRange (from, to) {
	if (from <= to) {
		return true;
	} else {
		return false;
	}
}

function emptyField (field) {
	if ((field == null) || (field == "")) {
		return true;
	} else {
		return false;
	}
}

function checkFields (aForm) {
  var option = document.getElementById('rangeType').value;
  if (option == 'continuous' || option == 'continuous2') {
	if (emptyField(aForm.from.value) || emptyField(aForm.to.value)) {
		alert("Please, complete all fields");
	    return false;
	} else {
		if (correctRange(aForm.from.value, aForm.to.value)) {
			return true;			
		} else {
			alert("The selected range is not correct");
			return false;
		}
	}
  } else {
	var codeCount = document.getElementById('inventaryList').options.length;
	if (codeCount == 0) {
		alert("Please, complete all fields"); 
	    return false;
	} else {
		var inventaryList = document.getElementById('inventaryList');
		var allCodes = '';
	  	for (i = 0; i <= inventaryList.options.length - 1; i++) {
			allCodes = allCodes + "'" + inventaryList.options[i].text + "',";
	  	}
  		allCodes = '(' + allCodes.substr(0, allCodes.length - 1) + ')';
	  	document.getElementById('individualCodes').value = allCodes;
	    return true;
	}
  }
}

function changeRange(selectBox) {
	var option = selectBox.value;
	var panel = document.getElementById(option);
	panel.style.display = 'inline';
	if (option == 'continuous') {
		document.getElementById('inventaryList').options.length = 0;
		document.getElementById('individuals').style.display = 'none';
		document.getElementById('individualCodes').value = "";
	} else {
		document.getElementById('from').value = "";
		document.getElementById('to').value = "";
		document.getElementById('continuous').style.display = 'none';
	}
}

function itemExists(code, list) {
  var ok = false;
  var listLength = list.length - 1;
  var count = 0;
  while (!(ok) && (count <= listLength)) {
	if (code == list[count].value) {
	  ok = true;
	}
	count = count + 1;
  }
  return ok;	
}

function addItem() {
  var codeObject = document.getElementById('inventaryCode');
  var inventaryCode = document.getElementById('inventaryCode').value;
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryCode == "") {
    alert('You can�t add an empty code.');
  } else {
    if (itemExists(inventaryCode, inventaryList.options)) {
	  codeObject.value = "";
  	  alert("The code is already included."); 
    } else {  	
	  var optionObject = new Option(inventaryCode, inventaryCode);
  	   if (!IE) {
	     inventaryList.add(optionObject, inventaryList.options[inventaryList.options.length]); 
      } else {
	    inventaryList.add(optionObject, inventaryList.options.length);
	  }
      codeObject.value = "";
    }
  }	
}

function removeItem() {
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryList.selectedIndex == -1) {
  	alert('You have to select a code first.');
  } else {
  	inventaryList.options[inventaryList.selectedIndex] = null;
  }
}

	function addCountryCode() {
		var panel = document.getElementById('addCountryCode');
		panel.style.display = 'inline';
		panel.style.top = mouseY;
		panel.style.left = mouseX;
	}
</script>
</head>
<body onload="javascript: changeRange(document.getElementById('rangeType'))">



From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes countryCodes.dat,NONE,1.1
Message-ID: <E1CmDMl-0002fl-ET@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes

Added Files:
	countryCodes.dat 
Log Message:
Required for barcode generator

--- NEW FILE ---
00 = USA I

93 = Australia

94 = New Zealand

779 = Argentina

773 = Uruguay

30 = France I

84 = Spain

45 = Japan

777 = Bolivia

80 = Italy I

73 = Sweden

40 = Germany

31 = France II

254 = Ucrania





From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig itemsLabelConfig.conf,NONE,1.1
Message-ID: <E1CmDMl-0002fp-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig

Added Files:
	itemsLabelConfig.conf 
Log Message:
Required for barcode generator

--- NEW FILE ---
marginBottom = 25
pageType = A4
columns = 5
systemDpi = 96
labelHeigth = 21
rows = 13
marginLeft = 2
labelWidth = 41




From tipaul at users.sourceforge.net  Thu Jan  6 15:32:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 06:32:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.114,1.115
Message-ID: <E1CmYgW-00045G-3h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/C4

Modified Files:
	Biblio.pm 
Log Message:
improvement of speed for bulkmarcimport.
A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
--- Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
***************
*** 1135,1140 ****
      my $tagfield;
      my $subfield;
!     $sth->execute($frameworkcode, $kohatable . "." . $kohafield );
!     ( $tagfield, $subfield ) = $sth->fetchrow;
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
--- 1135,1139 ----
      my $tagfield;
      my $subfield;
!     ( $tagfield, $subfield ) = MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
***************
*** 2635,2638 ****
--- 2634,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.115  2005/01/06 14:32:17  tipaul
+ # improvement of speed for bulkmarcimport.
+ # A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
+ # this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.
+ #
  # Revision 1.114  2005/01/03 10:48:33  tipaul
  # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)




From tipaul at users.sourceforge.net  Thu Jan  6 16:25:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 07:25:38 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CmZW6-000743-RB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27117/fr

Added Files:
	migrer_ses_donnees.xml 
Log Message:
document explaining how to migrate data & set up a highly tuned Koha catalogue (in French, sorry for frenchphobes or french-ignorants)

--- NEW FILE ---
<?xml version="1.0" encoding="ISO-8859-15"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<book>
  <title>Param�trer et migrer ses donn�es vers Koha 2.2</title>

  <chapter>
    <title>Introduction</title>

    <articleinfo><pubdate>2002-01-06</pubdate> <author>
    <firstname>Paul</firstname> <surname>POULAIN</surname> <authorblurb>
    Consultant ind�pendant en logiciels libres, Koha "Release Manager" pour la
    version 2.0 puis 2.2, membre du comit� de pilotage
    international<para></para></authorblurb><email>paul AT koha-fr.org</email>
    </author> <revhistory> <revision><revnumber>2.2.0</revnumber>
    <date>2005-01-06</date> <authorinitials>pp</authorinitials>
    <revdescription> Version initiale<para></para> </revdescription>
    </revision> </revhistory></articleinfo>

[...1138 lines suppressed...]
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);

</programlisting>

        <para>Notez que le code qui pr�c�de ne traite pas des notices
        d'exemplaire (l�, c'est vraiment trop sp�cifique)</para>
      </section>
    </section>
  </chapter>
</book>



From shedges at users.sourceforge.net  Mon Jan 10 12:59:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 10 Jan 2005 03:59:20 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,1.1,1.2
Message-ID: <E1CnyCe-0000CJ-0N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv749

Modified Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Add info on Apache and selinux

Index: Installing_Koha_on_Fedora.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/installation/Installing_Koha_on_Fedora.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Installing_Koha_on_Fedora.xml	2 Jan 2005 14:12:40 -0000	1.1
--- Installing_Koha_on_Fedora.xml	10 Jan 2005 11:59:17 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2005-01-03</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-09</pubdate>
  
      <author>
***************
*** 24,27 ****
--- 24,39 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-08</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Add information on SELinux to Apache section</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 457,461 ****
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust selinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
--- 469,473 ----
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust SELinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
***************
*** 522,525 ****
--- 534,561 ----
        <application>Apache</application>'s log files are in
        <filename>/var/log/httpd</filename>.</para>
+ 
+       <para>As with <application>MySQL</application>, there is an issue with
+       SELinux on <application>Fedora Core</application> 3 and the
+       <application>Apache</application> web server that prevents execution of
+       the CGI scripts. Instead of disabling SELinux for httpd, just change the
+       context for the <application>Koha</application> directories. The utility
+       for doing this is called '<command>chcon</command>.' Here's a brief
+       description of how to use it:</para>
+ 
+       <para>First, check the context for the directories that you know work
+       for httpd:<literallayout>[root at koha]# ls -Z /var/www/
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_script_exec_t cgi-bin
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t error
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t html
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t icons
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t manual
+ drwxr-xr-x  webalize root     system_u:object_r:httpd_sys_content_t usage</literallayout></para>
+ 
+       <para>Then, use the <command>chcon</command> utility to label the Koha
+       subdirectories as for their counterparts in
+       <filename>/var/www</filename>. Here's the syntax:<literallayout><userinput>chcon &lt;context&gt; /usr/local/koha/&lt;subdirectory&gt;</userinput></literallayout></para>
+ 
+       <para>For more info on SELinux check out the Fedora Core 3 FAQ: <ulink
+       url="http://fedora.redhat.com/docs/selinux-faq-fc3/">http://fedora.redhat.com/docs/selinux-faq-fc3/</ulink></para>
      </section>
  




From oleonard at users.sourceforge.net  Mon Jan 10 17:46:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:46:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.4.2.1
Message-ID: <E1Co2gz-0007Uw-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28801/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 17:49:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:49:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.5
Message-ID: <E1Co2jH-0007eH-Mz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29393/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:49:17 -0000	1.5
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:00:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:00:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marc_subfields_structure.tmpl,1.2,1.3
Message-ID: <E1Co2u9-0008Lm-GF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32072/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Synching with default tempalte

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marc_subfields_structure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marc_subfields_structure.tmpl	10 Jan 2005 17:00:30 -0000	1.3
***************
*** 4,120 ****
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
! <!-- TMPL_IF name="add_form" -->
! <!-- -->
! 
! 	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<h1><!-- TMPL_VAR name="action" --></h1>
! 	<div class="table"><table>
! 	<tr><th>Field</th>
! 		<th>Lib for librarians / for opac</th>
! 		<th>Repeat</th>
! 		<th>Mand</th>
! 		<th>Koha field</th>
! 		<th>Tab</th>
! 		<th>Authorised value or<br/>
! 				Thesaurus category</th>
! 	</tr>
! 	<!-- TMPL_LOOP name="loop" -->
! 		<tr>
! 		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
! <td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="40" maxlength="80" /><br />
! 				<input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="40" maxlength="80" /></td>
! 		
! 		<td><!-- TMPL_VAR name="repeatable" --></td>
! 		<td><!-- TMPL_VAR name="mandatory" --></td>
! 		<td><!-- TMPL_VAR name="kohafield" --></td>
! 		<td><!-- TMPL_VAR name="tab" --></td>
! 		<td><!-- TMPL_VAR name="authorised_value" --><br/>
! 				or <!-- TMPL_VAR name="thesaurus_category" --><br/>
! 				or <!-- TMPL_VAR name="value_builder" --></td></tr>
  	<!-- /TMPL_LOOP -->
! 	</table>	<input type="submit" class="submit" value="OK" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" />
! 	<p>Note : in the last column, you can choose :</p>
! 	<ul><li>An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table</li>
! 	<li>A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table</li>
! 	<li>A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly</li>
  	</ul>
! 	</div>
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirm" -->
! <!-- -->
! <div class="table details"><table>
! <caption>Confirm Deletion of Subfield <em><!-- TMPL_VAR name="tagsubfield" --></em></caption>
  	<tr>
! 		<th>Subfield</th>
! 		<td><!-- TMPL_VAR name="tagsubfield" --></td>
  	</tr>
- 	<tr><th>&nbsp;</th><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
- </table></div>
- 	<div class="tabitem">	<form action="<!-- TMPL_VAR name="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" />
- 	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
- 	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" /><input type="submit" class="cancel"  value="Delete this Subfield" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="submit" class="submit" value="Do not Delete" /></form></div>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirmed" -->
! <!-- -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR name="script_name" --> method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
! 	<input type="submit" class="submit"  value="OK" />
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- -->
! <!-- TMPL_IF name="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit". </p>
! <p>The column <b>koha field</b> shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link
! ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.</p>
! <div class="table">
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Lib</th>
! 	<th>Koha Field <span class="help" title="the koha-DB field linked to this subfield">?</span></th>
! 	<th>Rep <span class="help" title="subfield may be repeated (1=yes, 0=no)">?</span></th>
! 	<th>Mand <span class="help" title="subfield is mandatory (1=yes, 0=no)">?</span></th>
! 	<th>Tab <span class="help" title="subfield is shown in which tab (0-9 or item)">?</span></th>
! 	<th>Auth value <span class="help" title="values authorised for this subfield">?</span></th>
! 	<th>Thesaurus <span class="help" title="Thesaurus linked to this subfield">?</span></th>
! 	<th>Val build <span class="help" title="Value builder">?</span></th>
  	<th>Delete</th>
! </tr>
! <!-- TMPL_LOOP name="loop" -->
! <tr>
! 	<td><!-- TMPL_IF name="tagsubfield" --><!-- TMPL_VAR name="tagsubfield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="liblibrarian" --><!-- TMPL_VAR name="liblibrarian" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="kohafield" --><!-- TMPL_VAR name="kohafield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="repeatable" --><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="mandatory" --><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="tab" --><!-- TMPL_VAR name="tab" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="authorised_value" --><!-- TMPL_VAR name="authorised_value" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="thesaurus_category" --><!-- TMPL_VAR name="thesaurus_category" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="value_builder" --><!-- TMPL_VAR name="value_builder" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table>
  
! <div class="tabitem"><!-- TMPL_IF name="previous" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" /></a><!-- /TMPL_IF --> 
! 
! <form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" method="get"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="hidden" name="op" value="add_form" /><input type="submit" value="Edit Subfields" class="submit" /></form>
! 
! <form action="marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="tagfield" -->" name="searchfield" /><input type="submit" class="submit" value="&lt;&lt; Back to Tag" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" /></a><!-- /TMPL_IF --></div>
! </div>
  <!-- /TMPL_IF -->
- 
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 4,171 ----
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
! <!-- TMPL_IF NAME="add_form" -->
! <!-- ------------------------------------------------------------------------ -->
! 	<h1><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
! 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
! 	
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<table>
! 		<caption><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2></caption>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>MARC constraints</h3></th></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="repeatable">Repeatable: </label></td><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="mandatory">Mandatory: </label></td><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="seealso">Search also: </label></td><td><input type="text" id="seealso" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" />(example for 200a : '200c','200d','200e'...)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Koha link:</label></td><td><!-- TMPL_VAR NAME="kohafield" --></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>Editor constaints</h3></th>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Text for librarian</label></td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="libopac">Text for OPAC</label></td><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Managed in tab</label></td><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>hidden&nbsp;</label></td><td><!-- TMPL_VAR NAME="hidden" -->(subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label> URL&nbsp;</label></td><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authorised_value">Auth value:</label></td><td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		</tr>									 
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authtypes">...or Thesaurus:</label></td><td><!-- TMPL_VAR NAME="authtypes" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="value_builder">...or Plugin:</label></td><td><!-- TMPL_VAR NAME="value_builder" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="link">...or Link:</label></td><td><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)</td>
! 		</tr></table><br />
  	<!-- /TMPL_LOOP -->
! 	
! 	<input type="submit" class="submit" value="Save Changes">
! 	<p>Note: in the last column, you can choose:</p>
! 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
! 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
! 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
  	</ul>
! 	
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirm" -->
! <!-- ------------------------------------------------------------------------ -->
! <table border="0" cellspacing="0" cellpadding="2">
! 	<tr valign="top" bgcolor="#99cc33">
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Subfield</b></td>
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
! 	</tr>
! 	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
! 			</form>
! 		</td>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
! 			</form>
! 		</td>
  	</tr>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirmed" -->
! <!-- ------------------------------------------------------------------------ -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 	<input type="submit" value="OK">
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- ------------------------------------------------------------------------ -->
! <!-- TMPL_IF NAME="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="frameworkcode" -->(framework <!--TMPL_VAR NAME="frameworkcode" -->)<!-- /TMPL_IF --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
! <p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
! 
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
! 	<th>Constraints</th>
  	<th>Delete</th>
! <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
! 		<!-- TMPL_ELSE -->
! 			<!-- TMPL_VAR NAME="liblibrarian" -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i>subfield ignored</i>
! 		<!-- TMPL_ELSE -->
! 			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td><a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table><form class="inline" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" method="get"><input type="hidden" value="add_form" name="op" /><input type="hidden" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" name="tagfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="framworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Edit these Parameters" /></form>
! <form class="inline" action="/cgi-bin/koha/admin/marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR NAME="tagfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Back to MARC Tag Structure" /></form>
  
! <!-- TMPL_IF NAME="previous" -->
! 	<input type="submit" class="submit" value="&lt;&lt; Previous" />
! 	</a><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="next" -->
! 	<!-- TMPL_VAR NAME="next" -->
! 		<input type="submit" class="submit" value="Next &gt;&gt;" />
! 	</a>
! <!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:02:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:02:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1 bull-home.tmpl,1.1,1.2 order.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search-supply.tmpl,1.1,1.2 search.tmpl,1.1,1.2 statecollection.tmpl,1.2,1.3 subscription-add.tmpl,1.2,1.3
Message-ID: <E1Co2wU-0008WJ-9H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32715/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:05:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:05:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.1,1.1.2.1 order.tmpl,1.1,1.1.2.1 result.tmpl,1.1,1.1.2.1 search-supply.tmpl,1.1,1.1.2.1 search.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.2,1.2.2.1 subscription-add.tmpl,1.2,1.2.2.1
Message-ID: <E1Co2yY-0000Ea-Uu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
      Tag: rel_2_2
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:07:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:07:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1 acqui-topmenu.inc,1.1,1.2
Message-ID: <E1Co30v-0000NV-IQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1375/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	acqui-topmenu.inc 
Added Files:
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:07:13 -0000	1.2
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 18:08:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:08:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1.2.1 acqui-topmenu.inc,1.1,1.1.2.1
Message-ID: <E1Co320-0000Sg-2u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1761/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	acqui-topmenu.inc 
Added Files:
      Tag: rel_2_2
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:08:36 -0000	1.1.2.1
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 22:33:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:33:57 -0800
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25,1.26
Message-ID: <E1Co7Aj-0007XZ-Br@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28953/admin

Modified Files:
	marctagstructure.pl 
Log Message:
Moving HTML markup to the template

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** marctagstructure.pl	4 Oct 2004 20:37:14 -0000	1.25
--- marctagstructure.pl	10 Jan 2005 21:33:54 -0000	1.26
***************
*** 125,133 ****
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag",
! 								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
  		$template->param('heading-add-tag-p' => 1);
  	}
--- 125,132 ----
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => $searchfield);
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag");
  		$template->param('heading-add-tag-p' => 1);
  	}
***************
*** 225,231 ****
  		$row_data{mandatory} = $results->[$i]{'mandatory'};
  		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
- 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
  		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
--- 224,227 ----




From oleonard at users.sourceforge.net  Mon Jan 10 22:34:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:34:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27,1.28
Message-ID: <E1Co7BV-0007aj-Ks@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** marctagstructure.tmpl	19 Jul 2004 19:20:29 -0000	1.27
--- marctagstructure.tmpl	10 Jan 2005 21:34:42 -0000	1.28
***************
*** 147,153 ****
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->
--- 147,153 ----
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:38:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:38:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.2,1.3
Message-ID: <E1Co7FS-0007r2-Uq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30175/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
***************
*** 62,71 ****
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
- <!-- -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
--- 62,70 ----
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_IF NAME="searchfield" --><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR name="searchfield" --><!-- TMPL_ELSE --><input type="text" name="tagfield" size="3" maxlength="3" /><!-- /TMPL_IF --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
***************
*** 124,135 ****
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem"><!-- TMPL_IF name="previous" --><!-- TMPL_VAR name="previous" -->&lt;&lt;Previous Tags</a><!-- TMPL_ELSE --><!-- /TMPL_IF -->
! <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! 	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add tag" class="submit" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" -->Next Tags &gt;&gt;</a><!-- /TMPL_IF --></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 123,142 ----
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem">		<!-- TMPL_IF NAME="isprevpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="hidden" name="op" value="add_form">
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<input type="submit" class="submit" value="Add Tag"></form>		
! 		<!-- TMPL_IF NAME="nextpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="Next Page &gt;&gt;" class="submit" /></form>
! 		<!-- /TMPL_IF --></div>
! <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:45:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:45:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.3,1.4
Message-ID: <E1Co7M4-0008Ow-6D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32267/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Minor correction to HTML

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
--- marctagstructure.tmpl	10 Jan 2005 21:45:37 -0000	1.4
***************
*** 86,90 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  
--- 86,90 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  




From acli at users.sourceforge.net  Tue Jan 11 10:33:22 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:33:22 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,NONE,1.1.2.1
Message-ID: <E1CoIOw-00033E-5R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11467

Added Files:
      Tag: rel_2_2
	update.pl 
Log Message:
update.pl emulation script


--- NEW FILE ---
#!/usr/bin/perl

# Convenience script to update a po file
# This emulates the GNOME "update.pl" script

use strict;
use integer;

my $lang = $ARGV[0];
die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;

my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/

for my $spec (['css', 'opac'], ['default', 'intranet']) {
   my($theme, $module) = @$spec;
   my $pid = fork;
   die "fork: $!\n" unless defined $pid;
   if (!$pid) {
      if ($chdir_needed_p) {
	 chdir('..') || die "..: cd: $!\n";
      }
      exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
      die "tmpl_process3.pl: exec: $!\n";
   }
   wait;
}





From acli at users.sourceforge.net  Tue Jan 11 10:40:45 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:40:45 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CoIW5-0003P7-Qn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13054

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Minor comment correction


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** update.pl	11 Jan 2005 09:33:19 -0000	1.1.2.1
--- update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
***************
*** 1,5 ****
  #!/usr/bin/perl
  
! # Convenience script to update a po file
  # This emulates the GNOME "update.pl" script
  
--- 1,5 ----
  #!/usr/bin/perl
  
! # Convenience script to update two po files at once
  # This emulates the GNOME "update.pl" script
  




From acli at users.sourceforge.net  Tue Jan 11 10:51:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:51:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.2,1.1.2.3
Message-ID: <E1CoIg2-0003wx-B4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15036

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
More comments in the code to explain what it does
and check the language code command line argument a bit more carefully


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
--- update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
***************
*** 8,24 ****
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;
  
! my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/
  
! for my $spec (['css', 'opac'], ['default', 'intranet']) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
!       exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
        die "tmpl_process3.pl: exec: $!\n";
     }
--- 8,39 ----
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
! # Remember whether we see the "po" directory; this is used later to guess
! # whether the current directory is translator/po or translator.
! my $chdir_needed_p = 1 unless -d('po');
  
! # Go through the theme/module combinations we need to update. There can be
! # more than two; e.g., if we want ['default', 'opac'] too we can put it in
! for my $spec (
!       ['css',     'opac'    ],
!       ['default', 'intranet']
! ) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
+ 
+       # If current directory is translator/po instead of translator,
+       # then go back to the parent
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
! 
!       # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
! 	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
! 
        die "tmpl_process3.pl: exec: $!\n";
     }




From shedges at users.sourceforge.net  Tue Jan 11 12:39:13 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Tue, 11 Jan 2005 03:39:13 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/maintenance Updating_Koha.xml,1.1,1.2
Message-ID: <E1CoKMj-0001nf-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6898

Modified Files:
	Updating_Koha.xml 
Log Message:
minor change to cvs command following official 2.2.0 release

Index: Updating_Koha.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/maintenance/Updating_Koha.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Updating_Koha.xml	24 Dec 2004 15:44:59 -0000	1.1
--- Updating_Koha.xml	11 Jan 2005 11:39:09 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2004-12-15</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-11</pubdate>
  
      <author>
***************
*** 28,31 ****
--- 28,44 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-09</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Minor change to cvs command following official release of
+           2.2.0</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 173,177 ****
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co
      koha</userinput></para>
  
--- 186,190 ----
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co -r rel_2_2
      koha</userinput></para>
  




From tipaul at users.sourceforge.net  Tue Jan 11 15:45:43 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 06:45:43 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115,1.115.2.1
Message-ID: <E1CoNHD-0002Ik-9S@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
bugfix : issn were not stored correctly in non-MARC DB on biblio modification

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115
retrieving revision 1.115.2.1
diff -C2 -r1.115 -r1.115.2.1
*** Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
--- Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
***************
*** 1602,1607 ****
  sub OLDmodbibitem {
      my ( $dbh, $biblioitem ) = @_;
- 
-     #    my $dbh   = C4Connect;
      my $query;
  
--- 1602,1605 ----
***************
*** 1609,1612 ****
--- 1607,1611 ----
      $biblioitem->{'url'}           = $dbh->quote( $biblioitem->{'url'} );
      $biblioitem->{'isbn'}          = $dbh->quote( $biblioitem->{'isbn'} );
+     $biblioitem->{'issn'}          = $dbh->quote( $biblioitem->{'issn'} );
      $biblioitem->{'publishercode'} =
        $dbh->quote( $biblioitem->{'publishercode'} );
***************
*** 1628,1631 ****
--- 1627,1631 ----
  url             = $biblioitem->{'url'},
  isbn            = $biblioitem->{'isbn'},
+ issn            = $biblioitem->{'issn'},
  publishercode   = $biblioitem->{'publishercode'},
  publicationyear = $biblioitem->{'publicationyear'},
***************
*** 1645,1650 ****
          warn "$query";
      }
- 
-     #    $dbh->disconnect;
  }    # sub modbibitem
  
--- 1645,1648 ----
***************
*** 2634,2637 ****
--- 2632,2638 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
+ # bugfix : issn were not stored correctly in non-MARC DB on biblio modification
+ #
  # Revision 1.115  2005/01/06 14:32:17  tipaul
  # improvement of speed for bulkmarcimport.




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.tmpl,1.2,1.2.2.1 result.tmpl,1.4,1.4.2.1 subscription-detail.tmpl,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uN-Pl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.tmpl	5 Aug 2004 16:35:43 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 15:07:59 -0000	1.2.2.1
***************
*** 24,28 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 24,28 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** result.tmpl	2 Dec 2004 16:42:15 -0000	1.4
--- result.tmpl	11 Jan 2005 15:07:59 -0000	1.4.2.1
***************
*** 5,9 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
--- 5,9 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
***************
*** 13,21 ****
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 13,21 ----
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 48,52 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
  				</td>
  			</tr>
--- 48,52 ----
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
  				</td>
  			</tr>
***************
*** 57,61 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
--- 57,61 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
***************
*** 63,71 ****
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 63,71 ----
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** subscription-detail.tmpl	2 Nov 2004 16:29:13 -0000	1.6
--- subscription-detail.tmpl	11 Jan 2005 15:07:59 -0000	1.6.2.1
***************
*** 6,9 ****
--- 6,12 ----
  <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Issues</a>
  <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Biblio</a>
+ <!-- TMPL_UNLESS name="totalissues" -->
+ 	<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
+ <!-- /TMPL_UNLESS -->
  <form method="post" name="f">
  <div id="bloc25">




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25,1.25.2.1
Message-ID: <E1CoNcq-0003uJ-1v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
--- MARCdetail.pl	11 Jan 2005 15:08:00 -0000	1.25.2.1
***************
*** 57,61 ****
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionfrom biblionumber
  use HTML::Template;
  
--- 57,61 ----
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionsfrombiblionumber
  use HTML::Template;
  
***************
*** 190,194 ****
  }
  
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
--- 190,194 ----
  }
  
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
***************
*** 196,200 ****
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionid => $subscriptionid,
  						popup => $popup,
  						);
--- 196,200 ----
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionsnumber => $subscriptionsnumber,
  						popup => $popup,
  						);




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uF-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** Bull.pm	3 Dec 2004 14:34:54 -0000	1.6
--- Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
***************
*** 45,49 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &getsubscriptions &getsubscription &getsubscriptionfrombiblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
--- 45,50 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
! 			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
***************
*** 137,150 ****
  	$sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq, $subscriptionid, $val->{'biblionumber'}, 1, format_date_in_iso($startdate));
- 
- 	# next issue number
- 	#my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
- 	# next date (calculated from actual date & frequency parameters)
- 	#my $nextplanneddate = Get_Next_Date($startdate,$val);
- # 	$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
- # 													innerloop1=?,innerloop2=?,innerloop3=?
- # 													where subscriptionid = ?");
- # 	$sth->execute($newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3,$subscriptionid);
- # 	$sth->finish;  
  	return $subscriptionid;
  }
--- 138,141 ----
***************
*** 167,176 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscriptionid from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionid = $sth->fetchrow;
! 	return $subscriptionid;
  }
  
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
--- 158,186 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select count(*) from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionsnumber = $sth->fetchrow;
! 	return $subscriptionsnumber;
  }
  
+ sub get_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ?');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		push @res,$subs;
+ 	}
+ 	return \@res;
+ }
+ 
+ 
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
***************
*** 197,208 ****
  }
  
  sub getsubscriptions {
! 	my ($title,$ISSN) = @_;
! 	return unless $title or $ISSN;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 	$sth->execute("%$title%",$ISSN);
! 	my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
--- 207,235 ----
  }
  
+ sub delsubscription {
+ 	my ($subscriptionid) = @_;
+ 	# check again there is only one issue (the subscription is new)
+ 	my ($totalissues) = getserials($subscriptionid);
+ 	if ($totalissues eq 1) {
+ 		my $dbh = C4::Context->dbh;
+ 		$subscriptionid=$dbh->quote($subscriptionid);
+ 		$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from serial where subscriptionid=$subscriptionid");
+ 	}
+ }
  sub getsubscriptions {
! 	my ($title,$ISSN,$biblionumber) = @_;
! 	return unless $title or $ISSN or $biblionumber;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	if ($biblionumber) {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
! 		$sth->execute($biblionumber);
! 	} else {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 		$sth->execute("%$title%",$ISSN);
! 	}
! 		my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
***************
*** 217,221 ****
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription.
  sub getserials {
  	my ($subscriptionid) = @_;
--- 244,250 ----
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription
! # as well as the number of issues registered in the database (all types)
! # this number is used to see if a subscription can be deleted (=it must have only 1 issue)
  sub getserials {
  	my ($subscriptionid) = @_;
***************
*** 230,234 ****
  		push @serials,$line;
  	}
! 	return @serials;
  }
  
--- 259,266 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:31 -0800
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3,1.3.2.1 subscription-detail.pl,1.5,1.5.2.1
Message-ID: <E1CoNdH-0003vz-EA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl subscription-detail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** statecollection.pl	12 Aug 2004 14:36:07 -0000	1.3
--- statecollection.pl	11 Jan 2005 15:07:57 -0000	1.3.2.1
***************
*** 40,44 ****
  }
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
--- 40,44 ----
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
--- subscription-detail.pl	11 Jan 2005 15:07:58 -0000	1.5.2.1
***************
*** 70,75 ****
  }
  
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 70,83 ----
  }
  
+ if ($op eq 'del') {
+ 	&delsubscription($subscriptionid);
+ 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+ 	exit;
+ 
+ }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
! $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
! # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
  
  ($template, $loggedinuser, $cookie)
***************
*** 124,127 ****
--- 132,136 ----
  	subscriptionid => $subs->{subscriptionid},
  	serialslist => \@serialslist,
+ 	totalissues => $totalissues,
  	);
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:07 -0800
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36,1.36.2.1
Message-ID: <E1CoNfn-00047i-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15770/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
removing warning

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -r1.36 -r1.36.2.1
*** SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
--- SearchMarc.pm	11 Jan 2005 15:10:49 -0000	1.36.2.1
***************
*** 167,171 ****
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
- 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 167,170 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.35,1.35.2.1
Message-ID: <E1CoNgC-0004AG-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
circulation >> issue : showing borrowernumber code just after the borrower name.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** circulation.tmpl	15 Dec 2004 10:47:10 -0000	1.35
--- circulation.tmpl	11 Jan 2005 15:11:29 -0000	1.35.2.1
***************
*** 32,37 ****
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
  				</a>
  			</p>
--- 32,37 ----
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
  				</a>
  			</p>




From tipaul at users.sourceforge.net  Tue Jan 11 16:13:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:13:39 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,NONE,1.1.2.1 buildEDITORS.pl,NONE,1.1.2.1
Message-ID: <E1CoNiF-0004Hu-Ng@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16469/misc/migration_tools

Added Files:
      Tag: rel_2_2
	build6xx.pl buildEDITORS.pl 
Log Message:
new migration tools :
* build6xx : script that build 6xx tags in authority list. Note this script is a framework, it MUST be tuned.
* buildEDITORS : script that build EDITORS authority file from biblios. Useful for unimarc_210c and uinmarc_225a plugins. run without parameters to get help.

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$category,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$subfields,
    'v' => \$verbose,
    'c:s' => \$category,
);

if ($version || ($category eq '')) {
	print <<EOF
small script to recreate a authority table into Koha.
parameters :
\tc : thesaurus category. Can be filled with anything, the NC is hardcoded. But mandatory to confirm that you want to rebuild 6xx
\d : delete every entry of the selected category before doing work.

SAMPLES :
 ./build6xx.pl -c NC -d 
EOF
;#
die;
}

my $dbh = C4::Context->dbh;
my @subf = $subfields =~ /(##\d\d\d##.)/g;
if ($delete) {
	print "deleting thesaurus\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='NC'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='NC'");
	$dbh->do("delete from marc_subfield_table where tag='606' and subfieldcode='9'");
	$dbh->do("delete from marc_word where tagsubfield='6069'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;

# search biblios to "connect" to an authority with any number of $x (limited to 4 $x in this script)
my $sthBIBLIOS = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 where tag in (606) and subfieldcode='a' and subfieldvalue=?");
my $sthBIBLIOSx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=?");
my $sthBIBLIOSxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m3.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=?");
my $sthBIBLIOSxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=?");
my $sthBIBLIOSxxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid left join marc_subfield_table as m5 on m1.bibid=m5.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m5.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=? and m5.subfieldvalue=?");

# loop through each biblio
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $timeneeded = gettimeofday - $starttime;
	print "$i in $timeneeded s\n" unless ($i % 50);
	foreach my $field ($record->field(995)) {
		$record->delete_field($field);
	}
	my $totdone=0;
	my $authid;
	# search the 606 field(s)
	foreach my $field ($record->field("606")) {
		foreach my $authentry ($field->subfield("a")) {
			# the hashentry variable contains all $x fields and the $a in a single string. Used to differenciate
			# $xsomething$aelse and $asomething else
			my $hashentry = $authentry;
			foreach my $x ($field->subfield('x')) {
				$hashentry.=" -- $x";
			}
			# remove �,�,$e...
			# all the same for mysql, but NOT for perl hashes !
			# without those lines, t�t is not tot and pat�e is not patee
			$hashentry =~ s/�|�|�/e/g;
			$hashentry =~ s/�|�/a/g;
			$hashentry =~ s/�/i/g;
			$hashentry =~ s/�/o/g;
			$hashentry =~ s/�|�/u/g;
			# uppercase all, in case of typing error.
			$hashentry = uc($hashentry);
			$totdone++;
			if ($alreadydone{$hashentry}) {
				$authid = $alreadydone{$hashentry};
				print ".";
			} else {
				print "*";
				#create authority.
				my $authorityRecord = MARC::Record->new();
				my $newfield = MARC::Field->new(250,'','','a' => "".$authentry);
				foreach my $x ($field->subfield('x')) {
					$newfield->add_subfields('x' => $x);
				}
				foreach my $z ($field->subfield('z')) {
					$newfield->add_subfields('z' => $z);
				}
				$authorityRecord->insert_fields_ordered($newfield);
				$authid=AUTHaddauthority($dbh,$authorityRecord,'','NC');
				$alreadydone{$hashentry} = $authid;
				# we have the authority number, now we update all biblios that use this authority...
				my @x = $field->subfield('x'); # depending on the number of $x in the subfield
				if ($#x eq -1) { # no $x
					$sthBIBLIOS->execute($authentry);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS->fetchrow) {
						# check that the field does not already have a $x (if it has, it will or has been managed by another authority
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						# loop in each 606 field
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							# and rebuild the $x -- $x -- $a string (like for $hashentry, few lines before)
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							# ok, it's confirmed that we must add the $9 subfield for this biblio, so...
							$isOK=1 if $inEntry eq $hashentry;
						}
						# ... add it !
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 0) { # one $x
					$sthBIBLIOSx->execute($authentry,$x[0]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 1) { # two $x
					$sthBIBLIOSxx->execute($authentry,$x[0],$x[1]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 2) { # 3 $x
					$sthBIBLIOSxxx->execute($authentry,$x[0],$x[1],$x[2]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 3) { # 3 $x
					$sthBIBLIOSxxxx->execute($authentry,$x[0],$x[1],$x[2],$x[3]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x >4) {
					# too many $x, not handled, warn the developper that tries to migrate
					print "warning there is ".$#x.'$x values';
				}
			}
		}
	}
	$i++;
}
my $timeneeded = gettimeofday - $starttime;
print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild EDITORS

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $confirm,$delete);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'v' => \$verbose,
    'c' => \$confirm,
);

if ($version or !$confirm) {
	print <<EOF
small script to recreate a authority table into Koha.
This will parse all your biblios to recreate isbn / editor / collections for the unimarc_210c and unimarc_225a plugins.

Remember those plugins will work only if you have an EDITORS authority type, with
\t200a being the first 2 parts of an ISBN
\t200b being the editor name
\t200c (repeatable) being the series title

parameters :
\t-c : confirmation flag. the script will run only with this flag. Otherwise, it will just show this help screen.
\t-d : delete existing EDITORS before rebuilding them
\t-t : test parameters : run the script but don't create really the EDITORS
EOF
;#'

exit;
}

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting EDITORS\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='EDITORS'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='EDITORS'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;
my $counter;
my %hash;
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $isbnField = $record->field('010');
	next unless $isbnField;
	my $isbn=$isbnField->subfield('a');
	my $seg1;
	if(substr($isbn, 0, 1) <=7) {
		$seg1 = substr($isbn, 0, 1);
	} elsif(substr($isbn, 0, 2) <= 94) {
		$seg1 = substr($isbn, 0, 2);
	} elsif(substr($isbn, 0, 3) <= 995) {
		$seg1 = substr($isbn, 0, 3);
	} elsif(substr($isbn, 0, 4) <= 9989) {
		$seg1 = substr($isbn, 0, 4);
	} else {
		$seg1 = substr($isbn, 0, 5);
	}
	my $x = substr($isbn, length($seg1));
	my $seg2;
	if(substr($x, 0, 2) <= 19) {
# 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
		$seg2 = substr($x, 0, 2);
	} elsif(substr($x, 0, 3) <= 699) {
		$seg2 = substr($x, 0, 3);
	} elsif(substr($x, 0, 4) <= 8399) {
		$seg2 = substr($x, 0, 4);
	} elsif(substr($x, 0, 5) <= 89999) {
		$seg2 = substr($x, 0, 5);
	} elsif(substr($x, 0, 6) <= 9499999) {
		$seg2 = substr($x, 0, 6);
	} else {
		$seg2 = substr($x, 0, 7);
	}
	$counter++;
	print ".";
	my $timeneeded = gettimeofday - $starttime;
	print "$counter in $timeneeded s\n" unless ($counter % 50);
	
	my $field = $record->field('210');
	my $editor;
	$editor=$field->subfield('c') if $field;
	
	$field = $record->field('225');
	my $collection;
	$collection=$field->subfield('a') if $field;
	
	print "WARNING : editor empty for ".$record->as_formatted unless $editor and !$verbose;

	$hash{$seg1.$seg2}->{editors} = $editor unless ($hash{$seg1.$seg2}->{editors});
	$hash{$seg1.$seg2}->{collections}->{$collection}++ if $collection;
}

foreach my $isbnstart (sort keys %hash) {
	print "$isbnstart -- ".$hash{$isbnstart}->{editors} if $verbose;
	my $collections = $hash{$isbnstart}->{collections};
	my $seriestitlelist;
	foreach my $collection (sort keys %$collections) {
		print " CC $collection : ".$collections->{$collection} if $verbose;
		$seriestitlelist.=$collection."|";
	}
	my $authorityRecord = MARC::Record->new();
	my $newfield = MARC::Field->new(200,'','','a' => "".$isbnstart,
												'b' => "".$hash{$isbnstart}->{editors},
												'c' => "".$seriestitlelist);
	$authorityRecord->insert_fields_ordered($newfield);
	my $authid=AUTHaddauthority($dbh,$authorityRecord,'','EDITORS');

# 	print $authorityRecord->as_formatted."\n";
	print "\n" if $verbose;
}
exit;

# 	my $timeneeded = gettimeofday - $starttime;
# 	print "$i in $timeneeded s\n" unless ($i % 50);
# 	foreach my $field ($record->field(995)) {
# 		$record->delete_field($field);
# 	}
# 	my $totdone=0;
# 	my $authid;
# 	foreach my $fieldnumber (('710','711','712')) {
# 		foreach my $field ($record->field($fieldnumber)) {
# 	# 		print "=>".$field->as_formatted."\n";
# 			foreach my $authentry ($field->subfield("a")) {
# 				my $hashentry = $authentry;
# 				# la particularit� de ce script l�, c'est que l'entr�e dans la table d'autorit� est $a -- $b (et pas $x -- $x -- $x -- $a comme pour les autorit�s NC)
# 				# si n�cessaire, compl�ter avec le $c (n'existe pas dans le fichier que j'ai migr� avec cette moulinette
# 				# supprimer les accents, certaines entr�es sont sans, d'autres avec !
# 				# mysql ne diff�rencie pas, mais les hash perl oui !
# 				$hashentry =~ s/�|�|�/e/g;
# 				$hashentry =~ s/�|�/a/g;
# 				$hashentry =~ s/�/i/g;
# 				$hashentry =~ s/�/o/g;
# 				$hashentry =~ s/�|�/u/g;
# 				$hashentry = uc($hashentry);
# 				print "==>$hashentry" if $hashentry =~ /.*ETATS.*/;
# 				$totdone++;
# 				if ($alreadydone{$hashentry}) {
# 					$authid = $alreadydone{$hashentry};
# 					print ".";
# 				} else {
# 					print "*";
# 					#create authority.
# 					my $authorityRecord = MARC::Record->new();
# 					my $newfield = MARC::Field->new(210,'','','a' => "".$authentry, 
# 												'b' => "".$field->subfield('b'),
# 												'c' => "".$field->subfield('c'),
# 												);
# 					$authorityRecord->insert_fields_ordered($newfield);
# 					$authid=AUTHaddauthority($dbh,$authorityRecord,'','CO');
# 					$alreadydone{$hashentry} = $authid;
# 					# OK, on garde la notice d'autorit�, on cherche les notices biblio et on les met � jour...
# 					if ($fieldnumber eq '710') {
# 						$sthBIBLIOS710->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS710->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '711') {
# 						$sthBIBLIOS711->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS711->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '712') {
# 						$sthBIBLIOS712->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS712->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 				}
# 			}
# 		}
# 	}
# 	$i++;
# }
# my $timeneeded = gettimeofday - $starttime;
# print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";




From tipaul at users.sourceforge.net  Tue Jan 11 16:23:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:23:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_221.txt,NONE,1.1.2.1
Message-ID: <E1CoNs5-000596-0q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761/misc/release notes

Added Files:
      Tag: rel_2_2
	release_notes_221.txt 
Log Message:
release notes for 2.2.1

***** Bogus filespec: notes
--- NEW FILE ---
RELEASE NOTES
=============

Koha is the 1st Open-Source Integrated Library System.
Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.

Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).

With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).

========
WARNINGS
========
* the librarian interface is tested only with mozilla/firefox. Should work (partially) with IE. OPAC should work fine with any navigator.
* Any 2.1.x install must be uninstalled before installing 2.2.0 No update is provided for 2.1.0.

=======
DIFFS
=======
Diff 2.2.0 => 2.2.1
*******************
BUGFIXES

***** Critical

***** Minor
* in serials module >> add subscription >> select biblio : The next / previous page were invalid.
* in serials module >> add subscription >> select biblio : impossible to report the biblio when there is a quote in it (' was not escaped)
* issn were not stored correctly in non-MARC DB on biblio modification

IMPROVEMENTS
***** Major
* serial subscriptions : modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.
* serial subscriptions : you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)
**** Minor
* adding publicationyear and series title in opac advanced search form
* in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title
* circulation >> issue : showing borrowernumber code just after the borrower name.

Diff 2.2RC5 => 2.2.0
********************
BUGFIXES

***** Critical
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)

***** Minor
* error in authority => biblio 'jumper' that make the jump fail (was a remaining ')
* when modifying a biblio, on a repeated field with many subfields, the test to show empty subfields in X>1 was wrong : the missing subfields of the 1st field were repeated.
Example :
606 has $a$x$z
1st is 606$a (so $x$z empty)
2nd is 606$a$x
The marc editor in the 2nd field showed before this fix :
606 $a a_value
   $x another_value
   $x
   $z
(the 2nd $x being useless)
* Authorities : Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
IMPROVEMENTS

***** Major
* New systempref parameter : opacstylesheet If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)
* improvements in shelves management in OPAC (synch'ing with librarian interface) : the user can modify a bookshelf, add a book into a bookshelf from the biblio, create a bookshelf "on the fly", from the bookshelf popup.
* new directory migration_tools in $KOHA/misc Will store various migration tools. bulkmarcimport has been moved here.

**** Minor
* minor change in MARCdetail : when a field is repeated, the field header is not repeated but replaced by a nice little empty space.

Diff 2.2RC4 => 2.2RC5
*********************

BUGFIXES

***** Critical
* limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items) In 2.4, a new DB structure will highly speed things and this limit will be removed. FindDuplicate is activated again.
* bugfixes in french translation (that made cataloguing in french impossible)
* set lock_tables_privs = 'Y' during install stage. Note this requires a mysql version not too old.

***** Minor
* during update, if the user enter a different directory for backup than the default one, the updater does not obey and stores in default directory anyway !
* minor (spelling) fix for adding an organization
* member search (bug 851) : stripping out comma and apostrophe from search terms
* various methods to split subjects (depending on OS, a <CR> / <CR><LF> problem)

IMPROVEMENTS

***** Major
* circulation / issue : adding a button to cancel an issue when a confirmation is required (bug #858)
* circulation / issue : adding a checkbox to confirm reserve cancel when a reserved book is issued by someone else (bug #858)
* virtual shelves : adding feature to create a virtual shelf on the fly, when adding a biblio, and feature to modify a virtual shelf name/status
* catalogue : adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd

**** Minor
* an improvement has been done in DB calls that needs a new index. It's automatically added in fresh installs, but for updates, run the following SQL command :
ALTER TABLE `marc_subfield_structure` ADD INDEX ( `kohafield` ) 
* adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* the list of authorities types is now ordered by authtypetext. Thus you can use the "space trick" : if you add a space before an authtype text, it's shown first. Useful when you have an authority type that you use more often than others.
* authoritiy list shown in authtypetext order (so authtypetext with a space appear first, hint used everywhere else for lists)
* some minor html changes (like changing "images" numbers in "text" numbers for result list page numbers.

Diff 2.2RC3 => 2.2RC4
*********************
BUGFIXES

***** Critical
1 CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)
2 CRITICAL bugfix in Biblio.pm, removing &branches declaration (was due to an untested cvs rollback, opac-search.pl was crashing)
3 CRITICAL bugfix in Biblio.pm when MARC=OFF. subjects were stored and immediatly deleted. And not stored correctly in MARC part of the biblio. (thanks to Waylon Robertson)

***** Minor
1 bugfix in updatedatabase (auth_header creation table). Don't affect previous install of 2.2, only upgrades 2.0 => 2.2
2 reading rec : Fixing link to toggle between full and limited display
3 bugfix for moremember.pl that no longer outputed item type for issues
4 defaulting actual cost to estimated cost (was 0 by default)
5 bugfix : in biblio search, - and other signs where not properly managed. Leroy-Beaulieu could not be found
6 the popup of the 210c plugin closes when a collection is choosed
7 bugfix : could not select a biblio in subscription creation if the book was not for loan
8 minor fixes in spelling in subscription
9 adding acquisition in default userflags. This flag can be set for librarians that have access to acquisition
10 in subscription enddate calculation, bugfix when subscription based on number of issues (worked when based on subscription length)
11 in subscription next issue date calculation, bugfix when subscription frequency is 1/quarter.
12 datelastseen is updated when the book is returned
13 moredetail.pl shows incorrect date, incorrectly formatted (bug #689)
14 DuplicateFinder has been disabled : sometimes goes into a looonnnggg lasting loop.
15 when a query returns only one result, adding it to basket did not work.
16 deletion of a suggestion was buggy. Now fixed
17 for installation of Koha under Windows there is a bug with subject splitting. Now fixed. (thanks to Waylon Robertson)

IMPROVEMENTS
***** Major
1 a lot in book shelves
2 Submitting with no barcode in issues should clear for next patron (bug #865)
3 screen added to see late issues from a given bookseller
4 Koha should now work under mod_perl (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)

**** Minor
1 show also item tags into marc list of fields (in librarian search interface)
2 email sent basket : the sender can give it's name, in case the basket is sent to a friend, not to itself
3 removing useless string in isbd view
4 cataloguing, in isbnsearch, after searching a title/ISBN, the librarian can choose the framework (+ it's a cataloguing screen, not an acquisition one)
5 serials : in issues management, the waited/late issues bloc is before the collection state bloc.
6 serials : the intranet note has been removed, it's useless
7 after an authority is added/modified, go to this fresh authority (instead of authority-home)
8 search option in auth-top
9 in OPAC, the itemcallnumber search is a "start by" search (was a contains)
10 opac note is defaulted to '' (was 0, that means nothing)
11 adding blank to relshiploop (altrelationship) loop (Bug ???)
12 when deleting an itemtype, don't check issuingrules, but delete them too
13 For MARC=OFF installation, Waylon submitted a script to rebuild MARC part of the catalogue. It's in misc/updatemarc_subjects.pl (thanks to Waylon Robertson)

Diff 2.2RC2 => 2.2RC3
*********************
* CRITICAL bug in acquisition : biblio badly stored in MARC part of Koha, deleting another biblio...
* CRITICAL problem : the duplicate finder (when adding a biblio) has performances problems under certains circumstances.
* bug #862 fixed : Upgrade does not work (from 2.2RC1 to 2.2RC2)
* bugfix in acquisition, when a line is modified, aqorderbreakdown was duplicated. (Seems it was a mysql return value depending on mysql version)
* bugfix in setting user permissions (they were stored, but not shown correctly after)
* bugfix in translation error for basket sent in OPAC
* bugfix in 225a plugin (editor chooser)
* adding itemcallnumber entry in systempreferences during install
* error in biblio detail showing when MARC=ON (bug from RC2, did not exist before)
* bug in acceptorreject OPAC suggestion (bug from RC2, did not exist before)
* Not really a bug but : stopword must not be empty. If it's empty, the search fail.
* During install, the user can load french and english stopwords if he want.
* French librarian interface seems OK
* addbook (1st page when MARC=ON) is a catalogue screen, not an acquisition one
* The barcode is shown in the list of books issued by a borrower in opac-user page.

Diff 2.2RC1 => 2.2RC2
*********************
* bugfix for import in reservoir : title and isbn where not extracted.
* bugfix in OPAC : it was possible to reserve books that where "notforloan"
* bugfix in circulation : no warning when a reserve was made on a book that you try to issue to someone else. 
* bugfix & improvement for catalogue management behaviour when MARC=OFF
* bugfix in bookshelves (in CVS, probably not in official tar.gz)
* bugfix in online help (in CVS, probably not in official tar.gz)

=============
INSTALLATION
=============
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./installer.pl
* READ and FOLLOW the instructions

READING what is on screen during installation is VERY important. Some decisions you make during install stage are very hard to reproduce after.


UPGRADE from previous 2.0.0preX or RCx version
*******
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./koha.upgrade
* Follow the instructions

UPGRADE from previous 1.2.x version :
********
UPGRADE TO A 2.0.0 version before upgrading

UPGRADE from a 2.1.x version is NOT AVAILABLE. Don't install 2.2 on a 2.1.x test database. A lot of DB changes have been done since 2.1.x & cannot be handled by the DB updater.

=============
NEW FEATURES
=============
Koha 2.2 has, of course, all the previous features from Koha (acquisition, cataloguing, circulation, members modules, OPAC, complete MARC support...) plus the following new ones :

General :
*********
* (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
* Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
* Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
* Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
* mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
* Nelsonville have shared their templates. They are available as NPL theme.
* Language : in this version, only english and french versions are fully functionnal. Spanish and chinese are provided, but not fully functionnal. Polish, German, Arabic, Hebrew, and many other languages have volunteers and should be here in a future 2.2.x


BE CAREFUL with uninstaller : 
1- This script does not ask for confirmation after mysql root password.
2- This script uses /etc/koha.conf. If you have more than 1 koha on your server, use /etc/koha.conf for a "deletable-test" one.

Acquisition :
*************
* suggestion : borrowers can suggest items to buy in OPAC. Then, the librarian can manage (accept or refuse) and order them.
* possibility to close a basket, he can't be modified then
* order a basket by publisher or by bookfund/publisher
* search order history

Cataloguing :
*************
* Cataloguing frameworks : you can define as many frameworks as you want. A framework describes how a material is catalogued (which fields, subfields, which constraints on them...)
* MARC authorities : Koha now supports authorities in MARC. You can define the MARC structure for authorities like for biblios.
* New contraints can be set for subfields :
  - subfield is hidden : appears in MARC editor, but not in OPAC.
  - subfield is an URL : the field can be cliqued
  - related fields : a search made on a subfield also uses other subfields automatically. Using this feature, a search on "title" can search title, but also subtitle, uniform title,...
* Item location can now be done on 3 levels : the branch, the location (room), the callnumber.
* The callnumber can now be calculated from the LC, the dewey, or be freely (and manually) entered.
* Duplicate finder : this powerful feature help your cataloguers avoiding duplicate biblios.
* ISBD view : in librarian interface as well as in OPAC biblios can be shown in standard (default) presentation, in MARC (human readable) or ISBD. The ISBD view can be tuned by the librarian team. There is also a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* UNIMARC plugin for every 1xx fields : ESNMP have developped all the plugins for UNIMARC fields 1xx. Those fields are coded fields.

Serial cataloguing :
********************
Koha 2.2 manage serial subscriptions and issuing of those subscriptions. (Only a few words to describe a very important & complete module !)

Catalogue search :
******************
* Search in OPAC and librarian interface has been improved. They now are exactly the same.
* Spelling suggestion : before sending a request, the user can ask for spelling suggestion. This shows other forms of words entered that would give results. Give poor results for instance, the Koha team is thinking to a true spellchecking.
* The user can select the order of the results and the number of results shown.

Members :
*********
* The borrowernote field is shown on issue and transfer.
* The textmessaging field appears in OPAC when the user logs in.

Circulation :
*************
* New issuing rules : Issuing can be set for branch / borrower type / item category, by number of days and number of items available.
* "joker" issuing rules : the library can set issuing rules for "any branch" or "any borrower type", or "any item category".
Both issuing rules are cumulative : a library can set issuing rules to 10 books, 5 CD, but 12 total (books or CD).

OPAC :
******
In Koha 2.2, koha has :
* baskets. A basket can be printed or sent by mail to the borrower
* virtual shelves : a virtual shelf can be created and filled by any logged borrower. A given virtual shelf can be private or public. Or even free-for-all.
* language chooser : the borrower can change the language on the fly. The default language being still choosen by the library
* complete CSS definition. With a new systempref parameter : opacstylesheet. If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)

Barcode printing :
******************
A new module has been added to the parameters section : barcode printing. It requires the PDF::Api2 Perl package and can print barcode on 

============
Koha Future
============
The future of Koha is being discussed on mailing lists and on koha wiki : http://www.saas.nsw.edu.au/koha_wiki/index.php?page=KohaRoadmap2.2.x




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.15.2.1 opac-serial-issues.tmpl,1.2,1.2.2.1
Message-ID: <E1CoNsW-0005Bz-U5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl opac-serial-issues.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
***************
*** 130,137 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionid" -->
  		<p>
! 			This is a serial subscription. You can see which 
! 				<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have
--- 130,137 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
  		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-serial-issues.tmpl	13 Aug 2004 05:54:55 -0000	1.2
--- opac-serial-issues.tmpl	11 Jan 2005 15:24:14 -0000	1.2.2.1
***************
*** 5,9 ****
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <div id="bloc25">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
--- 5,10 ----
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <!-- TMPL_LOOP name="subscription_LOOP" -->
! <div id="bloc60">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
***************
*** 75,84 ****
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<h2 class="catalogue">Issues summary</h2>
! 	<p>
! 		<!-- TMPL_VAR name="opacnote" -->
! 	</p>
  </div>
! 
  </div>
  
--- 76,87 ----
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<!-- TMPL_IF name="opacnotes" -->
! 		<h2 class="catalogue">Issues summary</h2>
! 		<p>
! 			<!-- TMPL_VAR name="opacnote" -->
! 		</p>
! 	<!-- /TMPL_IF -->
  </div>
! <!-- /TMPL_LOOP -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.14.2.1 opac-serial-issues.pl,1.1,1.1.2.1
Message-ID: <E1CoNsY-0005CB-HC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl opac-serial-issues.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	11 Jan 2005 15:24:14 -0000	1.14.2.1
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 71,75 ****
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionid => $subscriptionid,
  );
  
--- 71,75 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionsnumber => $subscriptionsnumber,
  );
  

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-serial-issues.pl	12 Aug 2004 14:50:29 -0000	1.1
--- opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
***************
*** 18,25 ****
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my ($subscriptionid);
! 
! $subscriptionid = $query->param('subscriptionid');
! my $subscription = &getsubscription($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 18,23 ----
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
  ($template, $loggedinuser, $cookie)
***************
*** 32,57 ****
  
  # replace CR by <br> in librarian note
! $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	startdate => format_date($subscription->{startdate}),
! 	periodicity => $subscription->{periodicity},
! 	dow => $subscription->{dow},
! 	numberlength => $subscription->{numberlength},
! 	weeklength => $subscription->{weeklength},
! 	monthlength => $subscription->{monthlength},
! 	opacnote => $subscription->{opacnote},
! 	numberingmethod => $subscription->{numberingmethod},
! 	arrivalplanified => $subscription->{arrivalplanified},
! 	status => $subscription->{status},
! 	biblionumber => $subscription->{biblionumber},
! 	bibliotitle => $subscription->{bibliotitle},
! 	notes => $subscription->{notes},
! 	subscriptionid => $subscription->{subscriptionid}
  	);
! $template->param(
! 			"periodicity$subscription->{periodicity}" => 1,
! 			"arrival$subscription->{dow}" => 1,
! 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 30,56 ----
  
  # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	subscription_LOOP => $subscriptions
! # 	startdate => format_date($subscription->{startdate}),
! # 	periodicity => $subscription->{periodicity},
! # 	dow => $subscription->{dow},
! # 	numberlength => $subscription->{numberlength},
! # 	weeklength => $subscription->{weeklength},
! # 	monthlength => $subscription->{monthlength},
! # 	opacnote => $subscription->{opacnote},
! # 	numberingmethod => $subscription->{numberingmethod},
! # 	arrivalplanified => $subscription->{arrivalplanified},
! # 	status => $subscription->{status},
! # 	biblionumber => $subscription->{biblionumber},
! # 	bibliotitle => $subscription->{bibliotitle},
! # 	notes => $subscription->{notes},
! # 	subscriptionid => $subscription->{subscriptionid}
  	);
! # $template->param(
! # 			"periodicity$subscription->{periodicity}" => 1,
! # 			"arrival$subscription->{dow}" => 1,
! # 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jan 11 16:31:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:31:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-basket.tmpl,1.3,1.3.2.1
Message-ID: <E1CoNzA-0005fg-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21772/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-basket.tmpl 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: opac-basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.tmpl	13 Aug 2004 05:54:55 -0000	1.3
--- opac-basket.tmpl	11 Jan 2005 15:31:04 -0000	1.3.2.1
***************
*** 21,25 ****
  				<tr>
  					<th>
! 						<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
  					</th>
  				</tr>
--- 21,25 ----
  				<tr>
  					<th>
! 						<a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
  					</th>
  				</tr>




From tipaul at users.sourceforge.net  Tue Jan 11 16:32:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11,1.11.2.1
Message-ID: <E1CoO0e-0005mP-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22197/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
* adding series title and publication year limits in opac-search form.
* minor html improvement

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** opac-search.tmpl	2 Dec 2004 16:46:48 -0000	1.11
--- opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
***************
*** 6,10 ****
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc20">
  		<h2 class="catalogue">Search on</h2>
  		<p>
--- 6,10 ----
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc60">
  		<h2 class="catalogue">Search on</h2>
  		<p>
***************
*** 42,45 ****
--- 42,53 ----
  		</p>
  		<p>
+ 			<label class="label20">Series title</label>
+ 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="contains" />
+ 			<input type="text" name="value" onchange="sql_update()" size="35"/>
+ 		</p>
+ 		<p>
  			<label class="label20">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
***************
*** 95,98 ****
--- 103,120 ----
  			<input type="text" name="value" onchange="sql_update()" />
  		</p>
+ 		<p>
+ 			<label class="label20">Published between</label>
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value=">=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 			and
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="<=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 		</p>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 112,117 ****
  			</select>
  		</p>
- 		<p>&nbsp;</p>
- 		<p>&nbsp;</p>
  	</div>
  	<div id="bloc60">
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles home-go-button.gif,1.2,NONE
Message-ID: <E1CoO1n-0005rf-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images/styles

Removed Files:
      Tag: rel_2_2
	home-go-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- home-go-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:52 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images book.gif,1.2,NONE circle.gif,1.2,NONE disk.gif,1.2,NONE dk-brown-dot.gif,1.2,NONE dvd.gif,1.2,NONE fine.gif,1.2,NONE front-arrow.gif,1.2,NONE front-background-med.gif,1.2,NONE heading-login-2.gif,1.2,NONE heading-login.gif,1.2,NONE heading-member.gif,1.2,NONE heading-search-2.gif,1.2,NONE heading-search-3.gif,1.2,NONE heading-search.gif,1.2,NONE hltlogo.gif,1.2,NONE holder.gif,1.2,NONE jigsaw.gif,1.2,NONE koha.gif,1.2,NONE large-print.gif,1.2,NONE magazine.gif,1.2,NONE map.gif,1.2,NONE picture-book.gif,1.2,NONE place-reserve.jpg,1.2,NONE search-button.gif,1.2,NONE selected-circle.gif,1.2,NONE sm-book.gif,1.2,NONE sm-disk.gif,1.2,NONE sm-dvd.gif,1.2,NONE sm-jigsaw.gif,1.2,NONE sm-lg-print.gif,1.2,NONE sm-picture-book.gif,1.2,NONE sm-tape.gif,1.2,NONE talking-book.gif,1.2,NONE tan-dot.gif,1.2,NONE tape.gif,1.2,NONE vanilla-logout-button.gif,1.2,NONE
Message-ID: <E1CoO1o-0005ro-8x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images

Removed Files:
      Tag: rel_2_2
	book.gif circle.gif disk.gif dk-brown-dot.gif dvd.gif fine.gif 
	front-arrow.gif front-background-med.gif heading-login-2.gif 
	heading-login.gif heading-member.gif heading-search-2.gif 
	heading-search-3.gif heading-search.gif hltlogo.gif holder.gif 
	jigsaw.gif koha.gif large-print.gif magazine.gif map.gif 
	picture-book.gif place-reserve.jpg search-button.gif 
	selected-circle.gif sm-book.gif sm-disk.gif sm-dvd.gif 
	sm-jigsaw.gif sm-lg-print.gif sm-picture-book.gif sm-tape.gif 
	talking-book.gif tan-dot.gif tape.gif 
	vanilla-logout-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- book.gif DELETED ---

--- circle.gif DELETED ---

--- disk.gif DELETED ---

--- dk-brown-dot.gif DELETED ---

--- dvd.gif DELETED ---

--- fine.gif DELETED ---

--- front-arrow.gif DELETED ---

--- front-background-med.gif DELETED ---

--- heading-login-2.gif DELETED ---

--- heading-login.gif DELETED ---

--- heading-member.gif DELETED ---

--- heading-search-2.gif DELETED ---

--- heading-search-3.gif DELETED ---

--- heading-search.gif DELETED ---

--- hltlogo.gif DELETED ---

--- holder.gif DELETED ---

--- jigsaw.gif DELETED ---

--- koha.gif DELETED ---

--- large-print.gif DELETED ---

--- magazine.gif DELETED ---

--- map.gif DELETED ---

--- picture-book.gif DELETED ---

--- place-reserve.jpg DELETED ---

--- search-button.gif DELETED ---

--- selected-circle.gif DELETED ---

--- sm-book.gif DELETED ---

--- sm-disk.gif DELETED ---

--- sm-dvd.gif DELETED ---

--- sm-jigsaw.gif DELETED ---

--- sm-lg-print.gif DELETED ---

--- sm-picture-book.gif DELETED ---

--- sm-tape.gif DELETED ---

--- talking-book.gif DELETED ---

--- tan-dot.gif DELETED ---

--- tape.gif DELETED ---

--- vanilla-logout-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/includes crumb-end.inc,1.1,NONE crumb-start.inc,1.1,NONE home-modern.css,1.1,NONE itemtype-image.inc,1.1,NONE koha.css,1.1,NONE main.css,1.1,NONE opac.css,1.1,NONE script.js,1.1,NONE vanilla-about-menu.inc,1.1,NONE vanilla-about-menu.tmpl,1.1,NONE vanilla-botnav-all.inc,1.1,NONE vanilla-cat-search.inc,1.1,NONE vanilla-contact-menu.tmpl,1.1,NONE vanilla-crumb-end.inc,1.1,NONE vanilla-crumb-start.inc,1.1,NONE vanilla-end-main.inc,1.1,NONE vanilla-key.inc,1.1,NONE vanilla-left-nav.inc,1.1,NONE vanilla-logout.inc,1.1,NONE vanilla-main.css,1.1,NONE vanilla-member-menu.inc,1.1,NONE vanilla-membership-botnav.inc,1.1,NONE vanilla-membership-left-nav.inc,1.1,NONE vanilla-menu.inc,1.1,NONE vanilla-personal-details.inc,1.1,NONE vanilla-search-menu.inc,1.1,NONE
Message-ID: <E1CoO2S-0005uS-QY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc home-modern.css 
	itemtype-image.inc koha.css main.css opac.css script.js 
	vanilla-about-menu.inc vanilla-about-menu.tmpl 
	vanilla-botnav-all.inc vanilla-cat-search.inc 
	vanilla-contact-menu.tmpl vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing unido templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- home-modern.css DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-about-menu.inc DELETED ---

--- vanilla-about-menu.tmpl DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-contact-menu.tmpl DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/images unido-home-photos.jpg,1.1,NONE unido-logo.gif,1.1,NONE
Message-ID: <E1CoO2S-0005uJ-QP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/images

Removed Files:
      Tag: rel_2_2
	unido-home-photos.jpg unido-logo.gif 
Log Message:
removing unido templates, that are out of date

--- unido-home-photos.jpg DELETED ---

--- unido-logo.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/includes crumb-end.inc,1.2,NONE crumb-start.inc,1.2,NONE itemtype-image.inc,1.2,NONE koha.css,1.2,NONE main.css,1.2,NONE opac.css,1.2,NONE script.js,1.2,NONE vanilla-botnav-all.inc,1.2,NONE vanilla-cat-search.inc,1.2,NONE vanilla-crumb-end.inc,1.2,NONE vanilla-crumb-start.inc,1.2,NONE vanilla-end-main.inc,1.2,NONE vanilla-key.inc,1.2,NONE vanilla-left-nav.inc,1.2,NONE vanilla-logout.inc,1.2,NONE vanilla-main.css,1.3,NONE vanilla-member-menu.inc,1.2,NONE vanilla-membership-botnav.inc,1.2,NONE vanilla-membership-left-nav.inc,1.3,NONE vanilla-menu.inc,1.2,NONE vanilla-personal-details.inc,1.2,NONE vanilla-search-menu.inc,1.2,NONE
Message-ID: <E1CoO1p-0005ru-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc itemtype-image.inc koha.css 
	main.css opac.css script.js vanilla-botnav-all.inc 
	vanilla-cat-search.inc vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing vanilla templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en about.tmpl,1.2,NONE contact.tmpl,1.1,NONE opac-detail-all.tmpl,1.2,NONE opac-detail-multi.tmpl,1.1,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.6,NONE opac-search.tmpl,1.3,NONE
Message-ID: <E1CoO2S-0005uV-V4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en

Removed Files:
      Tag: rel_2_2
	about.tmpl contact.tmpl opac-detail-all.tmpl 
	opac-detail-multi.tmpl opac-detail.tmpl opac-main.tmpl 
	opac-search.tmpl 
Log Message:
removing unido templates, that are out of date

--- about.tmpl DELETED ---

--- contact.tmpl DELETED ---

--- opac-detail-all.tmpl DELETED ---

--- opac-detail-multi.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-search.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en loggedin.tmpl,1.2,NONE opac-account.tmpl,1.2,NONE opac-auth.tmpl,1.2,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.3,NONE opac-membership.tmpl,1.2,NONE opac-readingrecord.tmpl,1.2,NONE opac-reserve.tmpl,1.2,NONE opac-searchresults.tmpl,1.3,NONE opac-search.tmpl,1.2,NONE opac-userdetails.tmpl,1.2,NONE opac-user.tmpl,1.3,NONE opac-userupdate.tmpl,1.2,NONE
Message-ID: <E1CoO1q-0005ry-At@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en

Removed Files:
      Tag: rel_2_2
	loggedin.tmpl opac-account.tmpl opac-auth.tmpl 
	opac-detail.tmpl opac-main.tmpl opac-membership.tmpl 
	opac-readingrecord.tmpl opac-reserve.tmpl 
	opac-searchresults.tmpl opac-search.tmpl opac-userdetails.tmpl 
	opac-user.tmpl opac-userupdate.tmpl 
Log Message:
removing vanilla templates, that are out of date

--- loggedin.tmpl DELETED ---

--- opac-account.tmpl DELETED ---

--- opac-auth.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-membership.tmpl DELETED ---

--- opac-readingrecord.tmpl DELETED ---

--- opac-reserve.tmpl DELETED ---

--- opac-searchresults.tmpl DELETED ---

--- opac-search.tmpl DELETED ---

--- opac-userdetails.tmpl DELETED ---

--- opac-user.tmpl DELETED ---

--- opac-userupdate.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:35:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:35:30 -0800
Subject: [Koha-cvs] CVS: koha about.pl,1.4,1.4.4.1
Message-ID: <E1CoO3O-0005ym-1P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22968

Modified Files:
      Tag: rel_2_2
	about.pl 
Log Message:
correct detection of apache2 on mandrakelinux

Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** about.pl	28 Nov 2003 13:59:30 -0000	1.4
--- about.pl	11 Jan 2005 15:35:26 -0000	1.4.4.1
***************
*** 25,28 ****
--- 25,29 ----
  my $mysqlVersion = `mysql -V`;
  my $apacheVersion =  `httpd -v`;
+ $apacheVersion =  `httpd2 -v` unless $apacheVersion;
  
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:36:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:36:10 -0800
Subject: [Koha-cvs] CVS: koha bull-home.pl,1.2,1.2.2.1
Message-ID: <E1CoO42-00061v-0H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23155

Modified Files:
      Tag: rel_2_2
	bull-home.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull-home.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.pl	5 Aug 2004 16:37:07 -0000	1.2
--- bull-home.pl	11 Jan 2005 15:36:02 -0000	1.2.2.1
***************
*** 13,17 ****
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my @subscriptions = getsubscriptions($title,$ISSN);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",
--- 13,18 ----
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my $biblionumber = $query->param('biblionumber');
! my @subscriptions = getsubscriptions($title,$ISSN,$biblionumber);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",




From tipaul at users.sourceforge.net  Tue Jan 11 17:03:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:03:00 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.1,1.115.2.2
Message-ID: <E1CoOU0-0007el-HA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29334/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.1
retrieving revision 1.115.2.2
diff -C2 -r1.115.2.1 -r1.115.2.2
*** Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
--- Biblio.pm	11 Jan 2005 16:02:35 -0000	1.115.2.2
***************
*** 1806,1814 ****
          $item->{'location'},	   $item->{'itemnum'}
      );
-     if ( $item->{'barcode'} eq '' ) {
-         $item->{'notforloan'} = 0 unless $item->{'notforloan'};
-         $query = "update items set notforloan=? where itemnumber=?";
-         @bind = ( $item->{'notforloan'}, $item->{'itemnum'} );
-     }
      if ( $item->{'lost'} ne '' ) {
          $query = "update items set biblioitemnumber=?,
--- 1806,1809 ----
***************
*** 2632,2635 ****
--- 2627,2633 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.2  2005/01/11 16:02:35  tipaul
+ # in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.
+ #
  # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
  # bugfix : issn were not stored correctly in non-MARC DB on biblio modification




From tipaul at users.sourceforge.net  Tue Jan 11 17:10:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:10:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11.2.1,1.11.2.2
Message-ID: <E1CoOaz-00082r-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30879/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
1st fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=853

When I search by barcode from this page:
/cgi-bin/koha/search.marc/search.pl?type=intranet
A search for an existing barcode returns no results.  A search by call number
also returns no results.

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
--- opac-search.tmpl	11 Jan 2005 16:10:10 -0000	1.11.2.2
***************
*** 76,80 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>
--- 76,80 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>




From tipaul at users.sourceforge.net  Tue Jan 11 17:34:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:34:03 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.3.2.1
Message-ID: <E1CoOy3-00013w-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4030/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
The OPAC requires uses to log in to view virtual shelves, and it requires a user
with librarian privileges.  Virtual shelves should be viewable by all users,
logged in or not, and editable by all logged-in users in good standing.

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
***************
*** 43,47 ****
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
--- 43,47 ----
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
***************
*** 188,191 ****
--- 188,197 ----
  #
  # $Log$
+ # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
+ # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
+ # The OPAC requires uses to log in to view virtual shelves, and it requires a user
+ # with librarian privileges.  Virtual shelves should be viewable by all users,
+ # logged in or not, and editable by all logged-in users in good standing.
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Tue Jan 11 17:44:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:44:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1
Message-ID: <E1CoP7s-0001fg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6402/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:46:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:46:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 shelves.tmpl,NONE,1.1.2.1
Message-ID: <E1CoPA5-0001mS-Tr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6832/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.1.2.1,1.1.2.2 result.tmpl,1.1.2.1,1.1.2.2 subscription-detail.tmpl,1.2,1.2.2.1
Message-ID: <E1CoPH4-000264-0r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8042/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- bull-home.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:53:39 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From oleonard at users.sourceforge.net  Tue Jan 11 17:54:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:54:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.2,1.3 result.tmpl,1.2,1.3 subscription-detail.tmpl,1.2,1.3
Message-ID: <E1CoPHe-00028q-Jb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8212/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From tipaul at users.sourceforge.net  Tue Jan 11 18:41:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 09:41:54 -0800
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_225a.pl,1.8,1.8.2.1
Message-ID: <E1CoQ1i-0004oF-Ck@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18435/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Log Message:
fix to show seriestitle even for books without isbn (but with a editor, of course)

Index: unimarc_field_225a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** unimarc_field_225a.pl	23 Sep 2004 16:33:13 -0000	1.8
--- unimarc_field_225a.pl	11 Jan 2005 17:41:44 -0000	1.8.2.1
***************
*** 119,123 ****
  	# if there is an isbn, complete search
  		my @collections;
- 	if ($isbn_found) {
  		my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
  						left join auth_header on auth_subfield_table.authid=auth_header.authid 
--- 119,122 ----
***************
*** 135,146 ****
  			}
  		}
- 	} else {
- 	# if there is no isbn, search with %
- 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib");
- 		$sth->execute("\%$authoritysep $editor_found $authoritysep");
- 		while (my ($line)= $sth->fetchrow) {
- 			push @collections,$line;
- 		}
- 	}
  #	my @collections = ["test"];
  	my $collection =CGI::scrolling_list(-name=>'f1',
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 19:33:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:33:46 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes popup-bottom.inc,NONE,1.1.2.1 popup-top.inc,NONE,1.1.2.1
Message-ID: <E1CoQpu-0007ZH-N0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29081/koha-tmpl/opac-tmpl/css/en/includes

Added Files:
      Tag: rel_2_2
	popup-bottom.inc popup-top.inc 
Log Message:
missing files

--- NEW FILE ---
</body>
</html>

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
	<title>popup</title>
	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
	<!-- TMPL_IF name="opacstylesheet" -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
	<!-- TMPL_ELSE -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
	<!-- /TMPL_IF -->
</head>

<body>
<!-- NO MENUS for popup-top -->




From tipaul at users.sourceforge.net  Tue Jan 11 19:34:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:34:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes basket.js,1.3,1.3.2.1
Message-ID: <E1CoQr1-0007dd-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29346/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/basket.js,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** basket.js	8 Dec 2004 10:27:10 -0000	1.3
--- basket.js	11 Jan 2005 18:34:52 -0000	1.3.2.1
***************
*** 358,360 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 21:18:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 12:18:33 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.1,1.3.2.2
Message-ID: <E1CoSTJ-0005kR-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22081/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
--- opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};		
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
  # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :




From oleonard at users.sourceforge.net  Tue Jan 11 23:47:27 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:47:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.1.2.1
Message-ID: <E1CoUnP-0005gE-AI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21793/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding checkall() and confirmdelete() functions for use in virtual shelves

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
***************
*** 39,40 ****
--- 39,62 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 23:48:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:48:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images checkall.gif,NONE,1.1.2.1
Message-ID: <E1CoUoZ-0005lw-JJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22157/koha-tmpl/opac-tmpl/npl/en/images

Added Files:
      Tag: rel_2_2
	checkall.gif 
Log Message:
Adding checkall graphic for use in results lists

--- NEW FILE ---
GIF89a



From oleonard at users.sourceforge.net  Tue Jan 11 23:49:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:49:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1,1.1.2.1
Message-ID: <E1CoUpq-0005zk-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23003/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Many changes to appearance and functionality of virtual shelves

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-shelves.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
***************
*** 5,163 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
      <table>
      		<tr>
! 			<th colspan="4">
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
  		</tr>
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
  	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<!-- TMPL_IF name="manageshelf" -->
! 		<input type="submit" value="Remove Selected Items" class="submit">
! 	<!-- /TMPL_IF -->
! </form>
! <!-- TMPL_IF name="manageshelf" -->
! <form>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<table>
  		<tr>
! 			<td>
! 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
! 			</td>
! 			<td>
! 				<input name="addbarcode">
! 				<input type="hidden" name="modifyshelfcontents" value="1">
! 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 				<input type="submit" value="Save" class="submit">
! 			</td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		
! 		<h1>Bookshelves</h1>
! 		<table border="0" cellpadding="7">
! 			<tr>
! 				<td align="center" valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 						</p>
  					</form>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value=1>
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 					<p>
! 						<input type="submit" value="Delete Shelves" class="submit"></form>
! 					</p>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>
! 								<font color="white">Add Shelf</font>
! 							</th>
! 						</tr>
! 						<tr>
! 							<td>
! 								<p>Name : <input type="text" name="addshelf" size="25"></p>
! 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
! 								<p>Category : <select name="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select>
! 								</p>
! 								<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 									<li> A public can be seen by everybody, but managed only by you.</li>
! 									<li> A free can be managed by any user.</li>
! 								</p>
! 							</td>
! 						</tr>
! 					</table>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
! 
  	<!-- TMPL_ELSE -->
! 		
! 		<table>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<P>
! 			<a href="opac-shelves.pl?shelves=1" class="submit">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  </body>
--- 5,133 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
+ 	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
      		<tr>
! 			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><th>Barcode</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
  		</tr>
+ 		<!-- TMPL_IF NAME="itemsloop" -->
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
! 	<input type="hidden" name="modifyshelfcontents" value="1" />
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
! 					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
! 					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 					<td><!-- TMPL_VAR NAME="classification" --></td>
! 					<td><!-- TMPL_VAR Name="barcode" --></td>
! 		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
! 		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
! <br /><br />
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
  	<table>
+ 		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
  		<tr>
! 			<td><label for="addbarcode">Barcode:</label></td>
! 			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" class="submit" /></td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
+ <form class="inline" method="get" action="opac-shelves.pl"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="error"><!-- TMPL_VAR Name="string1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="error"><!-- TMPL_VAR Name="string" --></p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! <div id="center">
! <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
! 		<input type="hidden" name="shelves" value="1">
! 		<table>
! 		<caption>Create a New a Virtual Shelf</caption>
! 		<tr><td><label for="addshelf">Shelf Name:</label> </td><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
! 		<tr><td><label for="owner">Owner:</label> </td><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
! 		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select></td></tr></table>
! 		<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
! 			<li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
  					</form>
! 				</div>		
! 		
! 		<div id="right"><!-- TMPL_IF NAME="shelvesloop" -->
! 		<form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
! 					<input type="hidden" name="shelves" value="1" />
! 					<table>
! 					<caption>Delete Virtual Shelves</caption>
! 						<tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 		<input type="submit" value="Delete Shelves" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! 		<p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form></p>
! </div>
  	<!-- TMPL_ELSE -->
! 	<!-- TMPL_IF name="edit" -->
! 		<form method="post">
! 			<input type="hidden" name="op" value="modifsave">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
! 			<table>
! 			<caption>Modify Virtual Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
! 			<tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
! 			<tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
! 			<tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
! 					<!-- TMPL_IF name="category1" -->
! 						<option value="1" selected>Private</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="1">Private</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category2" -->
! 						<option value="2" selected>Public</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="2">Public</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category3" -->
! 						<option value="3" selected>Free</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="3">Free</option>
! 					<!-- /TMPL_IF -->
! 				</select></td></tr>
! 			</table>
! 			<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
! 				<li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
! 				<li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
! 			<p><input type="submit" value="Save Changes" class="submit"></p>
! 
! 		</form>
! <!-- /TMPL_IF -->
! <table>
! <caption>Virtual Shelves</caption>
! <tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
! <!-- TMPL_LOOP Name="shelvesloop" -->
! <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" class="submit" /></form></p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <br clear="both" />
  </div>
  </body>




From oleonard at users.sourceforge.net  Wed Jan 12 18:00:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:00:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.30.2.1
Message-ID: <E1Colrd-0001wb-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:00:52 -0000	1.30.2.1
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:02:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:02:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.31
Message-ID: <E1Colt1-00022g-2Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7838/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:02:20 -0000	1.31
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:46:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:46:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.2.2.1
Message-ID: <E1Coma8-0004ko-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18191/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:46:40 -0000	1.2.2.1
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:47:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:47:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.3
Message-ID: <E1Comav-0004oI-Ml@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18460/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:47:30 -0000	1.3
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:18:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:18:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.6.2.1
Message-ID: <E1CoowY-0004tW-H1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18742/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:19:05 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:19:05 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.7
Message-ID: <E1CooxN-0004wf-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18951/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.2
Message-ID: <E1Cop1n-0005Fb-IZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20148/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:36 -0000	1.2
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:03 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.1.2.1
Message-ID: <E1Cop1D-0005D9-8Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19981/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:00 -0000	1.1.2.1
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 22:34:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:34:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.6.2.1
Message-ID: <E1Coq8F-0001Fp-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4752/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:34:18 -0000	1.6.2.1
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From oleonard at users.sourceforge.net  Wed Jan 12 22:37:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:37:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.7
Message-ID: <E1CoqB5-0001VL-5Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5730/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:37:09 -0000	1.7
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From acli at users.sourceforge.net  Thu Jan 13 07:01:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 22:01:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6,1.6.2.1 opac-top.inc,1.8,1.8.2.1
Message-ID: <E1Coy3T-0003sN-EU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14334

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
We need the http-equiv headers for non-iso8859-1 translations.
(Arguably it's a bug in tmpl_process3, but HTML::Mason needs it; it is
easier to fix it here.)


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** opac-basket-top.inc	24 Nov 2004 16:08:55 -0000	1.6
--- opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
***************
*** 5,8 ****
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
--- opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
***************
*** 10,13 ****
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:22:38 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:22:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16,1.16.2.1
Message-ID: <E1CozJW-0006vS-Mn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26533

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Added http-equiv tag for non-iso-8859-1 charset support.  See bug 885.


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
--- opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
***************
*** 9,12 ****
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6.2.1,1.6.2.2 opac-top.inc,1.8.2.1,1.8.2.2
Message-ID: <E1Cozal-0007ez-DM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/includes

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
XML requires />


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
--- opac-basket-top.inc	13 Jan 2005 07:40:24 -0000	1.6.2.2
***************
*** 5,9 ****
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
--- opac-top.inc	13 Jan 2005 07:40:24 -0000	1.8.2.2
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.1,1.16.2.2
Message-ID: <E1Cozal-0007ex-BU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
XML requires />


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
--- opac-main.tmpl	13 Jan 2005 07:40:24 -0000	1.16.2.2
***************
*** 9,13 ****
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k9-II@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/fr/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvsHL2p76 and /tmp/cvsHehDJB differ




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k4-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/en/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvs5zEiwO and /tmp/cvsDnxCOi differ




From oleonard at users.sourceforge.net  Thu Jan 13 18:55:26 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:26 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help - New directory
Message-ID: <E1Cp9Bu-0005Pg-12@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20793/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities - New directory
Message-ID: <E1Cp9C7-0005Qb-9F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull - New directory
Message-ID: <E1Cp9C7-0005Qe-Fn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members - New directory
Message-ID: <E1Cp9C7-0005Qh-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/members

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc - New directory
Message-ID: <E1Cp9C7-0005Qk-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/search.marc

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin - New directory
Message-ID: <E1Cp9C7-0005QY-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/admin

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005X1-Ns@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
	authorities.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1 nohelp.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XC-D2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1 statecollection.tmpl,NONE,1.1 subscription-add.tmpl,NONE,1.1 subscription-detail.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XD-D5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XH-Dz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1 biblio_framework.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005Wx-36@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XN-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
	search.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 19:36:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:36:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.2 401.pl,1.1,1.2 402.pl,1.1,1.2 403.pl,1.1,1.2 404.pl,1.1,1.2 500.pl,1.1,1.2
Message-ID: <E1Cp9pH-0007fw-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29420/koha-tmpl/errors

Modified Files:
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 19:37:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:37:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.1.2.1 401.pl,1.1,1.1.2.1 402.pl,1.1,1.1.2.1 403.pl,1.1,1.1.2.1 404.pl,1.1,1.1.2.1 500.pl,1.1,1.1.2.1
Message-ID: <E1Cp9qg-0007ka-7F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29755/koha-tmpl/errors

Modified Files:
      Tag: rel_2_2
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 20:13:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:13:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CpAPI-0001LB-TS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5061/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:14:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:14:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.1.2.1 401.tmpl,1.1,1.1.2.1 402.tmpl,1.1,1.1.2.1 403.tmpl,1.1,1.1.2.1 404.tmpl,1.1,1.1.2.1 405.tmpl,1.1,1.1.2.1 500.tmpl,1.1,1.1.2.1
Message-ID: <E1CpAQe-0001PO-Rx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:41:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:41:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors - New directory
Message-ID: <E1CpAqs-0002nD-W8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10726/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 20:42:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:42:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1 401.tmpl,NONE,1.1 402.tmpl,NONE,1.1 403.tmpl,NONE,1.1 404.tmpl,NONE,1.1 405.tmpl,NONE,1.1 500.tmpl,NONE,1.1
Message-ID: <E1CpArh-0002pn-Gx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10872/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 20:47:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:47:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1.2.1 401.tmpl,NONE,1.1.2.1 402.tmpl,NONE,1.1.2.1 403.tmpl,NONE,1.1.2.1 404.tmpl,NONE,1.1.2.1 405.tmpl,NONE,1.1.2.1 500.tmpl,NONE,1.1.2.1
Message-ID: <E1CpAvu-00033Z-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11722/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 21:21:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:21:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint - New directory
Message-ID: <E1CpBTU-0005J7-Cl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20362/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint added to the repository
--> Using per-directory sticky tag `rel_2_2'





From oleonard at users.sourceforge.net  Thu Jan 13 21:22:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:22:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,NONE,1.1.2.1
Message-ID: <E1CpBU4-0005MK-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20589/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
      Tag: rel_2_2
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME=allsub-p -->
<table>
<caption>Results</caption>
<!-- TMPL_LOOP NAME="loop" -->
<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
<table>
<caption>Subject Heading Global Update</caption>
<tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
</table>
<input type="submit" value="Modify" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Successfully modified <!-- TMPL_VAR NAME="oldsub" escape=html -->
is now <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table>
<thead>
<tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Undelete</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
<h3>Succesfully undeleted</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<table>
<tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
<input type="hidden" name="type" value="updatetype" />
<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
</table>
<input type="submit" value="Change" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
<h3>Updated successfully</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<div class="menu">
<h1>Catalog Maintenance</h1>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Subject Maintenance</caption>
<tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/search.pl" method="post">
<table>
<caption>Group Maintenance</caption>
<tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
<tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Undelete Biblio</caption>
<tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>
</div>
<!-- /TMPL_IF -->

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:24:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:24:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.3,1.4
Message-ID: <E1CpBVp-0005VF-2F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21139/koha-tmpl/intranet-tmpl/npl/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.tmpl	19 Jul 2004 20:13:59 -0000	1.3
--- catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
***************
*** 1,9 ****
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
--- 1,15 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
+ <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
+ <table>
+ <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
+ </table>
  <!-- /TMPL_IF -->
  
***************
*** 11,20 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
- <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
--- 17,28 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
***************
*** 31,38 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
- <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 39,45 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 47,52 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
--- 54,59 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
***************
*** 54,61 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
--- 61,70 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
***************
*** 63,95 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
--- 72,110 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
+ </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:27:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:27:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.4,1.5
Message-ID: <E1CpBYu-0005jB-08@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21998/koha-tmpl/intranet-tmpl/default/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Replacing default template accidentally overwritten with NPL one

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
--- catmaintain.tmpl	13 Jan 2005 20:27:16 -0000	1.5
***************
*** 1,15 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
- <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
- <table>
- <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
- </table>
  <!-- /TMPL_IF -->
  
--- 1,9 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
***************
*** 17,28 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
--- 11,20 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
+ <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
***************
*** 39,45 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 31,38 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
+ <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 54,59 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
--- 47,52 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
***************
*** 61,70 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
--- 54,61 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
***************
*** 72,110 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
- </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 63,95 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:36:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:36:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,1.1,1.2
Message-ID: <E1CpBhp-0006Ia-Cy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24204/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte





From oleonard at users.sourceforge.net  Thu Jan 13 21:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:41:11 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.4
Message-ID: <E1CpBmJ-0006cd-5V@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25432/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};				
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.4  2005/01/13 20:41:07  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Thu Jan 13 21:46:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:46:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion - New directory
Message-ID: <E1CpBrn-00071e-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26941/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 21:48:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:48:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1 mail_suggestion_ORDERED.tmpl,NONE,1.1 mail_suggestion_REJECTED.tmpl,NONE,1.1
Message-ID: <E1CpBtV-0007Am-T1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27533/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 21:56:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:56:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1.2.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1.2.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1.2.1 mail_suggestion_ORDERED.tmpl,NONE,1.1.2.1 mail_suggestion_REJECTED.tmpl,NONE,1.1.2.1
Message-ID: <E1CpC1b-0007ld-4O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
      Tag: rel_2_2
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:48:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:48:54 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.3 members-home.pl,1.1,1.2
Message-ID: <E1CpCpq-0002Y9-5q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9792/members

Modified Files:
	member.pl members-home.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	13 Jan 2005 21:48:49 -0000	1.3
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	13 Jan 2005 21:48:50 -0000	1.2
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 22:50:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:50:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpCrO-0002fe-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10258/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:53:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:53:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.4
Message-ID: <E1CpCtu-0002qK-N1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10913/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 23:39:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:39:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1
Message-ID: <E1CpDct-0005fe-He@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.16,1.17
Message-ID: <E1CpDeM-0005lv-QJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22173/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** request.tmpl	26 Nov 2004 20:47:06 -0000	1.16
--- request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post" name="request">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
***************
*** 22,26 ****
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
--- 22,26 ----
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="openWindow('/cgi-bin/koha/members/members-home.pl?quicksearch=1', 'newwin'); return false;">(Quick Search)</a></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
***************
*** 149,151 ****
--- 149,162 ----
  	<!-- /TMPL_IF -->
  </div>
+ <script language="javascript" type="text/javascript">
+ 	// Set the value of the form field to the passed value and optionally shift
+ 	// focus and close the popup.
+ 	function FillForm(val,formname,formfield) {
+ 		document.forms[formname].elements[formfield].value = val;
+ 		// Uncomment below to shift focus after clicking link in popup.
+ 		document.forms[formname].elements[formfield].focus();
+ 		// Uncomment below to close popup after clicking link.
+ 		newwin.close();
+ 	}
+ </script>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpDfB-0005o6-Jx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22310/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From shedges at users.sourceforge.net  Fri Jan 14 00:56:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 15:56:51 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr/sysadmin/migration migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CpEpf-0001i3-CC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/sysadmin/migration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557

Added Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml and move to migration directory

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Paramétrer et migrer ses données vers Koha 2.2</title>

  <articleinfo>
    <pubdate>2005-01-06</pubdate>

    <author>
      <firstname>Paul</firstname>

      <surname>POULAIN</surname>

      <authorblurb>
        <para>Consultant indépendant en logiciels libres, Koha "Release
        Manager" pour la version 2.0 puis 2.2, membre du comité de pilotage
        international</para>
      </authorblurb>
[...1229 lines suppressed...]
  '011','','',
  'a' =&gt; $resul{ISSN},
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>

        <para>Notez que le code qui précède ne traite pas des notices
        d'exemplaire (là, c'est vraiment trop spécifique)</para>
      </section>
    </section>
  </section>
</article>



From shedges at users.sourceforge.net  Fri Jan 14 01:00:09 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 16:00:09 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.1,1.2
Message-ID: <E1CpEsr-0001tY-KC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7189

Modified Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml (moved to migration subdirectory)

Index: migrer_ses_donnees.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/fr/migrer_ses_donnees.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** migrer_ses_donnees.xml	6 Jan 2005 15:25:36 -0000	1.1
--- migrer_ses_donnees.xml	13 Jan 2005 23:59:54 -0000	1.2
***************
*** 1,89 ****
! <?xml version="1.0" encoding="ISO-8859-15"?>
! <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
! <book>
!   <title>Param�trer et migrer ses donn�es vers Koha 2.2</title>
  
!   <chapter>
      <title>Introduction</title>
  
!     <articleinfo><pubdate>2002-01-06</pubdate> <author>
[...2041 lines suppressed...]
  
!         <para>Notez que le code qui pr�c�de ne traite pas des notices
!         d'exemplaire (l�, c'est vraiment trop sp�cifique)</para>
        </section>
      </section>
!   </chapter>
! </book>
\ No newline at end of file
--- 1259,1268 ----
  );
  $newRecord-&gt;insert_fields_ordered($newField);
! my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>
  
!         <para>Notez que le code qui précède ne traite pas des notices
!         d'exemplaire (là, c'est vraiment trop spécifique)</para>
        </section>
      </section>
!   </section>
! </article>
\ No newline at end of file




From oleonard at users.sourceforge.net  Fri Jan 14 16:41:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:41:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1.2.1 nohelp.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTa1-0008IT-54@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31882/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
      Tag: rel_2_2
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lg-Ua@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1.2.1 statecollection.tmpl,NONE,1.1.2.1 subscription-add.tmpl,NONE,1.1.2.1 subscription-detail.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LR-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
      Tag: rel_2_2
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1.2.1 authorised_values.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 branches.tmpl,NONE,1.1.2.1 categorie.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 koha2marclinks.tmpl,NONE,1.1.2.1 marc_subfields_structure.tmpl,NONE,1.1.2.1 marctagstructure.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LN-A3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
      Tag: rel_2_2
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1.2.1 members-home.tmpl,NONE,1.1.2.1 moremember.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lc-Qa@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
      Tag: rel_2_2
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTav-0008LM-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
      Tag: rel_2_2
	authorities.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Fri Jan 14 22:08:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.3 newimember.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 newmember.tmpl,1.1,1.2
Message-ID: <E1CpYg8-000216-Rd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7721/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	14 Jan 2005 21:08:16 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:08:48 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.2,1.3 newbasket2.tmpl,1.1,1.2 order.tmpl,1.2,1.3 recieve.tmpl,1.1,1.2 recieveorder.tmpl,1.1,1.2 supplier.tmpl,1.1,1.2
Message-ID: <E1CpYga-000236-8R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7842/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:09:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:09:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.3
Message-ID: <E1CpYh4-00025c-3x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8006/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
	marcimport.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	14 Jan 2005 21:09:09 -0000	1.3
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:10:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:10:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CpYhs-0002Bf-To@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:44:09 -0000	1.1
--- addbookbybiblionumber.tmpl	14 Jan 2005 21:10:04 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Fri Jan 14 22:16:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:16:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.3,1.4 search.tmpl,1.2,1.3 searchresultlist.tmpl,1.1,1.2 subscription-bib-search.tmpl,1.1,1.2
Message-ID: <E1CpYnq-0002XY-Lh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9754/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
--- result.tmpl	14 Jan 2005 21:16:14 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- search.tmpl	14 Jan 2005 21:16:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:17:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:17:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.3
Message-ID: <E1CpYp6-0002ba-Vl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9984/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	branchtransfers.tmpl 
Log Message:
Converting popup links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	14 Jan 2005 21:17:33 -0000	1.3
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Fri Jan 14 22:19:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:19:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.3 doc-head-close-addbiblio.inc,1.1,1.2 doc-head-close.inc,1.1,1.2
Message-ID: <E1CpYql-0002im-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10440/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	14 Jan 2005 21:19:15 -0000	1.3
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Fri Jan 14 22:23:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:23:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes main-top.inc,1.3,NONE
Message-ID: <E1CpYuS-0002vL-7T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11232/koha-tmpl/intranet-tmpl/npl/en/includes

Removed Files:
	main-top.inc 
Log Message:
Removing main-top.inc.  Other includes are used in its place (doc-head-open.inc and doc-head-close.inc)

--- main-top.inc DELETED ---




From oleonard at users.sourceforge.net  Fri Jan 14 22:33:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:33:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.2
Message-ID: <E1CpZ4G-0003Pp-AL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13110/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categoryitem.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	14 Jan 2005 21:33:12 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:34:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:34:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.2 modbib.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2
Message-ID: <E1CpZ5d-0003UY-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13394/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From acli at users.sourceforge.net  Sat Jan 15 06:51:37 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Fri, 14 Jan 2005 21:51:37 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.23,1.23.2.1
Message-ID: <E1CpgqX-0002h0-P4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9389

Modified Files:
      Tag: rel_2_2
	buildrelease 
Log Message:
Taught buildrelease what the misc directory and release 2.2 is, and also
that version numbers might only have 1 dot. This should fix bugs 889, 890.

A --verbose or -v option has been added in the process of doing the above.

It now chdir to .. if it discovers that it is being run inside misc, since
running it inside misc screws up various things, and I never remember
whether it should be run inside misc or not.

A confirmation message about whether to tag or not is now displayed after
the user answers the question about tagging. I have never felt safe not
having the release builder confirm with me that I really am not tagging
anything.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** buildrelease	5 Jan 2005 14:31:06 -0000	1.23
--- buildrelease	15 Jan 2005 05:51:35 -0000	1.23.2.1
***************
*** 1,4 ****
--- 1,60 ----
  #!/usr/bin/perl
+ # This script uses standard 8-space tabs with 4-space indents
+ # vi users can :set sw=4 ai sm
  
+ use Getopt::Long;
+ use vars qw( $verbose_p );
+ 
+ GetOptions(
+     'verbose|v' => \$verbose_p,
+ ) || exit(1);
+ 
+ print <<EOM;
+ ***************************************
+ * Welcome to the Koha Release Builder *
+ ***************************************
+ EOM
+ 
+ #----------------------------------------------------------
+ # To guess the version, we need to first guess where this
+ # script itself is Otherwise we will have different results
+ # depending on whether the script is called as ./buildrelease
+ # or misc/buildrelease. If we run the script from misc, we
+ # will also get errors from "cvs update" later, so this is
+ # rather important information
+ #----------------------------------------------------------
+ print STDERR "Perl reports that buildrelease is $0\n" if $verbose_p;
+ my $self_path;
+ if ($0 =~ /^(\.\/)*buildrelease$/) {
+     $self_path = 'buildrelease';
+ } elsif ($0 =~ /^(?:(\.\/)*\/)?misc\/buildrelease$/) {
+     $self_path = 'misc/buildrelease';
+ } else {
+     print <<EOM;
+ 
+ WARNING: Unable to determine where the buildrelease script is located.
+          The version number guessed by the next step might be wrong.
+ EOM
+     $self_path = (-f 'buildrelease')? 'buildrelease': 'misc/buildrelease';
+ }
+ print STDERR "Assuming buildrelease is $self_path\n" if $verbose_p;
+ 
+ #----------------------------------------------------------
+ # Fixup the current directory
+ #----------------------------------------------------------
+ if ($self_path eq 'buildrelease') {
+     print <<EOM;
+ 
+ WARNING: You should run the buildrelease script from the top of the koha
+          CVS module.  I will try to change to the correct directory, but
+          it is better if you had ran this script there in the first place.
+ EOM
+     chdir ".." || die "..: chdir: $!\n";
+     $self_path = 'misc/buildrelease';
+ }
+ 
+ #----------------------------------------------------------
+ # Start the release builder
+ #----------------------------------------------------------
  #sub guess_kohahtmldir ($;$);
  #----------------------------------------------------------
***************
*** 14,17 ****
--- 70,74 ----
  
  if (-e "$roothomedir/.kohaautobuild.conf") {
+     print STDERR "$roothomedir/.kohaautobuild.conf found\n" if $verbose_p;
      open C, "<$roothomedir/.kohaautobuild.conf";
      while (<C>) {
***************
*** 30,37 ****
  
  print qq |
- ***************************************
- * Welcome to the Koha Release Builder *
- ***************************************
- 
  This script will automatically build a release tarball.
  
--- 87,90 ----
***************
*** 39,45 ****
  out for the release that you want to build, although it will update the modules
  before building.
- 
  |;
! print "\nWhere is the 'koha' cvs module located [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
--- 92,97 ----
  out for the release that you want to build, although it will update the modules
  before building.
  |;
! print "\nWhere is the 'koha' cvs module located? [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
***************
*** 62,72 ****
  #kohahtmldir=$kohahtmldir
  |;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print "\n\nGuessing at next release version.  You may need to enter your SourceForge password...\n";
  chdir $kohadir;
! open (CVSLOG, "cvs log misc/buildrelease|");
  my $symbolicnamessection=0;
  my $symbolicnames;
--- 114,128 ----
  #kohahtmldir=$kohahtmldir
  |;
+ print STDERR "$roothomedir/.kohaautobuild.conf written\n" if $verbose_p;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print <<EOM;
! 
! Guessing the next release version. You may need to enter your SourceForge password.
! EOM
  chdir $kohadir;
! open (CVSLOG, "cvs log $self_path|");
  my $symbolicnamessection=0;
  my $symbolicnames;
***************
*** 79,97 ****
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/R_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id=~s/-/\./g;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 135,156 ----
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
+ 	print STDERR "Scanning symbolic names from cvs output\n" if $verbose_p;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/(?:R|rel)_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id =~ s/[-_]/\./g;
! 	    print STDERR "Found a tag for release $id\n" if $verbose_p;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 99,109 ****
  		    $released=0;
  		    $highestrc=$rc;
  		}
  	    } else {
  		$version=$id;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 158,170 ----
  		    $released=0;
  		    $highestrc=$rc;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    } else {
  		$version=$id;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 111,117 ****
--- 172,180 ----
  		    $released=1;
  		    $highestrc=0;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    }
  	    $symbolicnames->{$version}->{$rc}=1;
+ 	    print STDERR "Setting symbolic name mapping for version $version $rc to 1\n" if $verbose_p;
  	}
      }
***************
*** 121,143 ****
  my $currentversion='';
  
! my $branchdata=`grep buildrelease CVS/Entries`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! 
! if ($branch eq 'Trel-1-2') {
!     $highestversion=$majorversion->{'1.2'};
!     $highestrc=$majorversionrc->{'1.2'};
      ($highestrc) ? ($released=0) : ($released=1);
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     $components[$#components]++;
!     $nexthighestversion=join '.', @components;
!     my $minornumber=(split(/\./, $highestversion))[1];
!     if ($minornumber/2 == int($minornumber/2)) {
! 	$releaseversion=$nexthighestversion."RC1";
      } else {
! 	$releaseversion=$nexthighestversion;
      }
      $currentversion=$highestversion;
--- 184,219 ----
  my $currentversion='';
  
! my $cvs_entries_path = $self_path;
! $cvs_entries_path =~ s/[^\/]+$/CVS\/Entries/;
! print STDERR "Assuming CVS/Entries is $cvs_entries_path\n" if $verbose_p;
! 
! my $branchdata=`grep buildrelease $cvs_entries_path`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! $branch =~ s/^T//;
! $branch =~ s/^(?:R|rel)_//;
! $branch =~ s/[-_]/./g;
! print STDERR "Detected branch $branch\n" if $verbose_p;
! 
! if ($branch =~ /\S/ && defined $majorversion->{$branch}) {
!     $highestversion=$majorversion->{$branch};
!     $highestrc=$majorversionrc->{$branch};
      ($highestrc) ? ($released=0) : ($released=1);
+     print STDERR "Using highest version for branch $branch\n" if $verbose_p;
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     if (@components < 3) { # if it's something like just 2.2 or 2.4
! 	$releaseversion = $highestversion.".1RC1";
      } else {
! 	$components[$#components]++;
! 	$nexthighestversion=join '.', @components;
! 	my $minornumber=(split(/\./, $highestversion))[1];
! 	if ($minornumber/2 == int($minornumber/2)) {
! 	    $releaseversion=$nexthighestversion."RC1";
! 	} else {
! 	    $releaseversion=$nexthighestversion;
! 	}
      }
      $currentversion=$highestversion;
***************
*** 155,159 ****
      print "\nWould you like to rebuild the $currentversion tarball?  Y/[N]: ";
      chomp($input = <STDIN>);
-     print STDERR "releaseversion=($releaseversion), currentversion=($currentversion)\n";#XXXZZZ
      if ($input =~ /^y/i) {
  	$releaseversion=$currentversion;
--- 231,234 ----
***************
*** 178,185 ****
  chomp ($input=<STDIN>);
  my $cvstag=0;
- # FIXME: This means anything other than n will tag; too dangerous?
  if ($input=~/^y/i) {
      $cvstag=1;
  }
  
  
--- 253,260 ----
  chomp ($input=<STDIN>);
  my $cvstag=0;
  if ($input=~/^y/i) {
      $cvstag=1;
  }
+ print "The CVS repository ",($cvstag?"WILL BE TAGGED\n":"will not be tagged\n");
  
  
***************
*** 329,332 ****
--- 404,408 ----
  
  
+ # Given two version numbers (v1, v2), returns 0 if v1 <= v2, or 1 if v1 > v2
  sub versioncompare {
      my $v1=shift;




From oleonard at users.sourceforge.net  Tue Jan 18 18:35:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 09:35:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-auth.tmpl,1.1,1.1.2.1 opac-main.tmpl,1.3,1.3.2.1
Message-ID: <E1CqxGp-0007Jf-Or@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28083/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-main.tmpl 
Log Message:
Removing NPL-specific javascript function which was trying to validate library card numbers

Index: opac-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-auth.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-auth.tmpl	18 Jan 2005 17:35:51 -0000	1.1.2.1
***************
*** 35,39 ****
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid" onblur="ValidateCode();"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>
--- 35,39 ----
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-main.tmpl	8 Dec 2004 16:12:17 -0000	1.3
--- opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
***************
*** 12,16 ****
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" onblur="ValidateCode();" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>
--- 12,16 ----
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>




From oleonard at users.sourceforge.net  Tue Jan 18 21:09:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 12:09:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.4,1.5
Message-ID: <E1Cqzfh-0007io-9K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29568/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
--- request.tmpl	18 Jan 2005 20:09:28 -0000	1.5
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:10:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:10:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.2.2.1 doc-head-close-addbiblio.inc,1.1,1.1.2.1 doc-head-close.inc,1.1,1.1.2.1
Message-ID: <E1Cr0cs-0002XC-Qu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9555/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	18 Jan 2005 21:10:15 -0000	1.2.2.1
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Tue Jan 18 22:16:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:16:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.3.2.1
Message-ID: <E1Cr0iE-0002lc-O0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10542/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	18 Jan 2005 21:16:24 -0000	1.3.2.1
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:22:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:22:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.1.2.1 modbib.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.1,1.1.2.1 updatebiblio.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr0nf-000345-OM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:38:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:38:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.1.2.2,1.1.2.3 search.tmpl,1.1.2.1,1.1.2.2 searchresultlist.tmpl,1.1,1.1.2.1 subscription-bib-search.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr13x-0003si-LN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14728/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
--- result.tmpl	18 Jan 2005 21:38:04 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Tue Jan 18 22:55:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:55:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1Js-0004nJ-BT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18387/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Tue Jan 18 22:57:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:57:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1La-0004sQ-Oc@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18688/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:59:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:59:16 -0800
Subject: [Koha-cvs] CVS: koha/members members-home.pl,1.1,1.1.2.1
Message-ID: <E1Cr1Nc-0004yv-Rw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19123/members

Modified Files:
      Tag: rel_2_2
	members-home.pl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	18 Jan 2005 21:59:09 -0000	1.1.2.1
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Tue Jan 18 23:07:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:07:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1.2.1
Message-ID: <E1Cr1Vr-0005KP-5g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20451/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
      Tag: rel_2_2
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Tue Jan 18 23:11:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:11:59 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.2.2.1
Message-ID: <E1Cr1Zv-0005Z4-DY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21337/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	18 Jan 2005 22:11:43 -0000	1.2.2.1
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');




From oleonard at users.sourceforge.net  Tue Jan 18 23:53:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:53:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1 auth_tag_structure.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1
Message-ID: <E1Cr2Dk-0007jK-Cf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29639/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan 19 18:17:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:17:32 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_subfields_structure.pl,1.3,1.3.2.1 marc_subfields_structure.pl,1.32,1.32.2.1
Message-ID: <E1CrJSW-0006Sl-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24771/admin

Modified Files:
      Tag: rel_2_2
	auth_subfields_structure.pl marc_subfields_structure.pl 
Log Message:
fix for #902 (it's impossible to set the subfield 400$0)

Index: auth_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** auth_subfields_structure.pl	10 Jun 2004 08:58:34 -0000	1.3
--- auth_subfields_structure.pl	19 Jan 2005 17:17:08 -0000	1.3.2.1
***************
*** 200,204 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 200,204 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
***************
*** 282,286 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 282,286 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];




From tipaul at users.sourceforge.net  Wed Jan 19 18:24:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:24:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.22.2.1
Message-ID: <E1CrJZ6-0006s1-Uz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26371/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
removing 2 useless columns

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
***************
*** 255,261 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Upper Age Limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Age Required</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Fine</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Overdue</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Issue limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Reserve</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
--- 255,259 ----
***************
*** 270,274 ****
  				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
  				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
- 				<td><!-- TMPL_VAR NAME="finetype" --></td>
  				<td><!-- TMPL_IF NAME="overduenoticerequired" -->
  						<i>Yes</i>
--- 268,271 ----
***************
*** 277,281 ****
  					<!-- /TMPL_IF -->
  				</td>
- 				<td><!-- TMPL_VAR NAME="issuelimit" --></td>
  				<td><!-- TMPL_VAR NAME="reservefee" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
--- 274,277 ----




From tipaul at users.sourceforge.net  Wed Jan 19 18:32:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:32:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters auth_tag_structure.tmpl,1.2,1.2.2.1
Message-ID: <E1CrJhH-0007I7-Vk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27964/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
in authority structure, trying to delete a tag in an authority type, deleted the tag in the default authority type.


Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.tmpl	19 Jul 2004 19:19:54 -0000	1.2
--- auth_tag_structure.tmpl	19 Jan 2005 17:32:31 -0000	1.2.2.1
***************
*** 89,92 ****
--- 89,93 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed">
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Wed Jan 19 18:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:40:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1CrJov-0007fM-Iw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29449/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Fixing typo: nested TMPL_VAR tag that would cause internal server error

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
--- member.tmpl	19 Jan 2005 17:40:33 -0000	1.4.2.2
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Wed Jan 19 18:44:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:44:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.1.2.1
Message-ID: <E1CrJsA-0007qn-Sw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30092/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Removing non-functional renew link

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
- <th>Status</th>
  </tr>
  
--- 86,89 ----
***************
*** 97,107 ****
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
- <td>
- <!-- TMPL_IF NAME="status" -->
- <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
- <!-- TMPL_ELSE -->
- Not renewable
- <!-- /TMPL_IF -->
- </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,99 ----




From oleonard at users.sourceforge.net  Wed Jan 19 22:18:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:18:10 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.15
Message-ID: <E1CrNDO-0001oA-GL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6934/opac

Modified Files:
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	19 Jan 2005 21:18:06 -0000	1.15
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Wed Jan 19 22:22:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:22:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.2
Message-ID: <E1CrNH7-00026r-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8040/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 21:21:59 -0000	1.2
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <th>Status</th>
  </tr>
  
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <!-- <th>Status</th> -->
  </tr>
  
***************
*** 92,101 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
--- 96,105 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <!-- <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
***************
*** 103,107 ****
  Not renewable
  <!-- /TMPL_IF -->
! </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 107,111 ----
  Not renewable
  <!-- /TMPL_IF -->
! </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 121,136 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
--- 125,144 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>




From oleonard at users.sourceforge.net  Wed Jan 19 22:39:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:39:28 -0800
Subject: [Koha-cvs] CVS: koha request.pl,1.28,1.29
Message-ID: <E1CrNY0-0003Rv-8l@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13177

Modified Files:
	request.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should display that information.

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** request.pl	13 Jul 2004 12:55:01 -0000	1.28
--- request.pl	19 Jan 2005 21:39:25 -0000	1.29
***************
*** 134,141 ****
--- 134,145 ----
  		my $item = $res->{'itemnumber'};
  		$item = getiteminformation(\%env,$item);
+ 		$reserve{'holdingbranch'}=$item->{'holdingbranch'};
  		$reserve{'barcode'}=$item->{'barcode'};
  		$reserve{'biblionumber'}=$item->{'biblionumber'};
  		$reserve{'wbrcode'} = $res->{'branchcode'};
  		$reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 		if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+ 			$reserve{'atdestination'} = 1;
+ 		}
      }
      $reserve{'date'} = format_date($res->{'reservedate'});




From oleonard at users.sourceforge.net  Wed Jan 19 22:45:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:45:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.17,1.18
Message-ID: <E1CrNeJ-0003ys-10@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15288/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Otherwise waiting items will be shown as "in transit" between holding branch and destination branch.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
--- request.tmpl	19 Jan 2005 21:45:56 -0000	1.18
***************
*** 109,113 ****
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 							Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">
--- 109,118 ----
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 						<!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- /TMPL_IF -->
! 		<input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">




From tipaul at users.sourceforge.net  Thu Jan 20 16:06:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 20 Jan 2005 07:06:35 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_tag_structure.pl,1.2,1.2.2.1
Message-ID: <E1CrdtL-0008Qq-3o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32360/admin

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.pl 
Log Message:
deleting tags for the requested framework only.

Index: auth_tag_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.pl	10 Jun 2004 08:58:34 -0000	1.2
--- auth_tag_structure.pl	20 Jan 2005 15:06:31 -0000	1.2.2.1
***************
*** 174,177 ****
--- 174,178 ----
  	$template->param(liblibrarian => $data->{'liblibrarian'},
  							searchfield => $searchfield,
+ 							authtypecode => $authtypecode,
  							);
  													# END $OP eq DELETE_CONFIRM
***************
*** 180,185 ****
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield'");
  	}
  													# END $OP eq DELETE_CONFIRMED
--- 181,186 ----
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
  	}
  													# END $OP eq DELETE_CONFIRMED




From oleonard at users.sourceforge.net  Thu Jan 20 18:34:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:34:32 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.3.2.1
Message-ID: <E1CrgCW-00025w-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8017/admin

Modified Files:
      Tag: rel_2_2
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:34:30 -0000	1.3.2.1
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:36:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:36:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.3.2.1
Message-ID: <E1CrgED-0002Fa-Vi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8610/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:36:15 -0000	1.3.2.1
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:37:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:37:58 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.4
Message-ID: <E1CrgFq-0002Mg-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9072/admin

Modified Files:
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:37:56 -0000	1.4
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:38:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:38:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.4
Message-ID: <E1CrgGA-0002P6-IV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9222/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:38:16 -0000	1.4
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:39:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:39:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters biblio_framework.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1
Message-ID: <E1CrgHV-0002VQ-Kf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9613/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 18:41:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:41:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1.2.1 auth_tag_structure.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1
Message-ID: <E1CrgIv-0002bx-2r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
      Tag: rel_2_2
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 19:03:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:03:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.35
Message-ID: <E1Crgef-0003zx-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15346/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:03:33 -0000	1.35
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:04:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:04:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.34.2.1
Message-ID: <E1Crgfr-000461-LG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15729/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
      Tag: rel_2_2
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -r1.34 -r1.34.2.1
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:04:49 -0000	1.34.2.1
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:42:37 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32.2.1,1.32.2.2
Message-ID: <E1CrhGP-0006Um-PO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24947/admin

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C2 -r1.32.2.1 -r1.32.2.2
*** marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
--- marc_subfields_structure.pl	20 Jan 2005 18:42:29 -0000	1.32.2.2
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 19:44:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:44:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.38.2.1
Message-ID: <E1CrhHx-0006bv-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25334/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -r1.38 -r1.38.2.1
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:44:05 -0000	1.38.2.1
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:45:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:45:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.39
Message-ID: <E1CrhJF-0006iP-LS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25747/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:45:29 -0000	1.39
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:48:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:48:17 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32,1.33
Message-ID: <E1CrhLt-0006vq-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26578/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	20 Jan 2005 18:48:12 -0000	1.33
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.3.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.2,1.2.2.1 newbasket2.tmpl,1.1,1.1.2.1 order.tmpl,1.2,1.2.2.1 recieve.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 supplier.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri2G-00010b-PC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3765/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	20 Jan 2005 19:31:57 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	20 Jan 2005 19:31:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri2q-00012w-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
      Tag: rel_2_2
	marcimport.tmpl 
Log Message:
Correction to header includes

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	20 Jan 2005 19:32:37 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 20:34:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:34:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Cri49-00017f-GK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4275/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:46:27 -0000	1.1.2.1
--- addbookbybiblionumber.tmpl	20 Jan 2005 19:33:57 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Thu Jan 20 20:35:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:35:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri5t-0001Dp-37@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4677/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	branchtransfers.tmpl 
Log Message:
Converting pop-up links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	20 Jan 2005 19:35:46 -0000	1.2.2.1
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 20:37:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:37:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.2.2.1 newimember.tmpl,1.1,1.1.2.1 newjmember.tmpl,1.1,1.1.2.1 newmember.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri74-0001If-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4947/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	20 Jan 2005 19:36:57 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:19:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:19:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22.2.1,1.22.2.2
Message-ID: <E1Crilq-0004fb-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17861/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
--- categorie.tmpl	20 Jan 2005 20:19:05 -0000	1.22.2.2
***************
*** 261,265 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 261,265 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.23
Message-ID: <E1Crimi-0004kC-LA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18170/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	20 Jan 2005 20:20:01 -0000	1.23
***************
*** 263,267 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 263,267 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:18 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.16.2.1
Message-ID: <E1Crimw-0004le-B9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/admin

Modified Files:
      Tag: rel_2_2
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:15 -0000	1.16.2.1
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:21:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:21:11 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.17
Message-ID: <E1Crinn-0004oi-JN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18443/admin

Modified Files:
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:57 -0000	1.17
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:22:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:22:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.1.2.1
Message-ID: <E1CripH-0004uJ-3z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18847/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categoryitem.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	20 Jan 2005 20:22:40 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:23:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:23:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.2.2.1
Message-ID: <E1Cripq-0004wg-8T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:23:15 -0000	1.2.2.1
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:24:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:24:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.3
Message-ID: <E1Criqh-00050w-7i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:24:08 -0000	1.3
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 22:27:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:27:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrjqM-00010Q-DL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
      Tag: rel_2_2
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** acceptorreject.tmpl	13 Jan 2005 20:56:56 -0000	1.1.2.1
--- acceptorreject.tmpl	20 Jan 2005 21:27:52 -0000	1.1.2.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:30:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:30:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1,1.2
Message-ID: <E1Crjst-00019B-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4357/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	13 Jan 2005 20:48:31 -0000	1.1
--- acceptorreject.tmpl	20 Jan 2005 21:30:20 -0000	1.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:31:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:31:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,NONE,1.1.2.1 suggestion-select.tmpl,NONE,1.1.2.1
Message-ID: <E1Crjte-0001DJ-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4647/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
      Tag: rel_2_2
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	<h1>Order search</h3>
	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
		<tr>
			<th>&nbsp;</th>
			<th>Title</th>
			<th>Author</th>
			<th>Supplier</th>
			<th>Placed on</th>
			<th>Recieved on</th>
			<th>Quantity ordered</th>
			<th>&nbsp;</th>
		</tr>
		<tr>
			
				<th>Filter By:</th>
				<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th><input type="submit" class="submit" value="Set Filter" /></th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr>
				<td>&nbsp;</td>
				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
				<td><!-- TMPL_VAR NAME="author" --></td>
				<td><!-- TMPL_VAR NAME="name" --></td>
				<td><!-- TMPL_VAR name="creationdate" --></td>
				<td><!-- TMPL_VAR name="datereceived" --></td>
				<td><!-- TMPL_VAR name="quantity" --></td>
				<td>&nbsp;</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table></form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	
	<form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="post">
<div class="data">	<table>
	<caption>Filter Suggestion Results</caption>
	<tr><th><label for="title">Title:</label></th><td><input type="text" name="title" id="title" value="<!-- TMPL_VAR NAME="title"-->" /></td></tr>
	<tr><th><label for="author">Author:</label> </th><td><input type="text" id="author" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></td></tr>
	<tr><th><label for="publishercode">Publisher:</label></th><td><input type="text" id="publishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></td></tr>
	</table></div>
<p><input type="submit" class="submit" value="Set Filter" /></p></form>
<div class="table searchresults">
	<table>
		<caption>Suggestions</caption>
		<tr>
			<th>Suggestion</th>
			<th>Suggested by</th>
			<th>Accepted by</th>
			<th>&nbsp;</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
					<p>
						<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
				</td>
				<td>
					<!-- TMPL_IF name="biblionumber" -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->">Order</a>
					<!-- TMPL_ELSE -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->">Order</a>
					<!-- /TMPL_IF -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 20 22:32:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:32:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1,1.2 suggestion-select.tmpl,1.1,1.2
Message-ID: <E1CrjuT-0001GX-3H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4840/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte






From oleonard at users.sourceforge.net  Thu Jan 20 22:44:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:44:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,1.2,1.2.2.1
Message-ID: <E1Crk6s-000260-J6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8035/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	about.tmpl 
Log Message:
Synching with default tempalte

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** about.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- about.tmpl	20 Jan 2005 21:44:56 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 8,12 ****
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table"><div class="items"><table>
    <tr>
        <th>Koha version:</th>
--- 8,12 ----
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table items"><table>
    <tr>
        <th>Koha version:</th>
***************
*** 33,56 ****
   <table>
   <caption>Credits</caption>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li>Pat Eyler, Kaitiaki</li>
! 	<li>Paul Poulain, 2.0 release manager (MARC developper)</li>
! 	<li>Joshua Ferraro &amp; the Nelsonville Public Library (MARC features funders)</li>
! 	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
! 	<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 	<li>Mike Hansen</li>
! 	<li>MJ Ray and Turo Technology LLP, England (quality control, installer &amp; updater)</li>
! 	<li>Nicolas Morin, French Translation</li>
! <li><b>Horowhenua Library Trust</b>
! Rosalie Blake, Head of Libraries
! Jo Ransom</li>
! <li><b>Katipo Communications</b>
! Rachel Hamilton-Williams, General Manager (Webmistress)
! Chris Cormack, 1.2 release manager
! and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 						Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul>
  					</td>
  				</tr>
--- 33,57 ----
   <table>
   <caption>Credits</caption>
+ 	<tr><th>Special thanks to the following funders</th></tr>
+ 			<tr><td><ul><li><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
+ 		<li>The <b>Nelsonville Public Library</b> (MARC support)</li>
+ 		<li><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</li>
+ 		<li><b>ENSMP (Ecole Nationale Sup�rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</li></ul></td></tr>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li><b>Rachel Hamilton-Williams</b>, Kaitiaki</li>
! 		<li><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</li>
! 		<li>Stephen Hedges and the <b>Nelsonville Public Library</b> (MARC features funders)</li>
! 		<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 		<li>Mike Hansen</li>
! 		<li>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer and updater, 2.0 release maintainer)</li>
! 		<li><b>Katipo Communications</b></li>
! 		<ul>
! 			<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
! 			<li>Chris Cormack, 1.2 release manager</li>
! 			<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li>
! 			</ul>
  					</td>
  				</tr>
***************
*** 59,92 ****
  					<td>
  <ul>
! 	<li>Adam Thick</li>
! 	<li>Andrew Hooper</li>
! 	<li>Al Banks</li>
! 	<li>Ambrose Li</li>
! 	<li>Andrew Arensburger</li>
! 	<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 	<li>Brig C. McCoy</li>
! 	<li>Daniel Holth</li>
! 	<li>David Strainchamps</li>
! 	<li>Dorian Meid</li>
! 	<li>Ed Summers</li>
! 	<li>Florian Bischof</li>
! 	<li>Francisco M. Marzoa Alonso</li>
! 	<li>Glen Stewart</li>
! 	<li>Henri-Damien Laurent</li>
! 	<li>J�rome Vizcaino (Esiee School)</li>
! 	<li>Kip DeGraaf</li>
! 	<li>Marco Gaiarin</li>
! 	<li>Md. Aftabuddin</li>
! 	<li>Michaes Herman</li>
! 	<li>Michel Lerenard (Esiee School)</li>
! 	<li>Mike Johnson</li>
! 	<li>Mike Mylonas</li>
! 	<li>Pierre Cauchois (Esiee School)</li>
! 	<li>Pawel Skuza (Polish for 1.2)</li>
! 	<li>Regula Sebastiao</li>
! 	<li>Roger Buck</li>
! 	<li>Ron Wickersham</li>
! 	<li>Sebastiaan Durand</li>
! </ul>					</td>
  				</tr>
  			</table>
--- 60,94 ----
  					<td>
  <ul>
! 					<li>Adam Thick</li>
! 					<li>Andrew Hooper</li>
! 					<li>Al Banks</li>
! 					<li>Ambrose Li (chinese translation and translation tool)</li>
! 					<li>Andrew Arensburger (the small and great C4::Context module)</li>
! 					<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 					<li>Brig C. McCoy</li>
! 					<li>Daniel Holth</li>
! 					<li>David Strainchamps</li>
! 					<li>Dorian Meid (German translation)</li>
! 					<li><b>doXulting</b> (Matthieu Branlat) OPAC basket</li>
! 					<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
! 					<li><b>Esiee School</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
! 					<li>Florian Bischof</li>
! 					<li>Francisco M. Marzoa Alonso</li>
! 					<li>Glen Stewart</li>
! 					<li>Henri-Damien Laurent</li>
! 					<li>Jo Ransom</li>
! 					<li>Kip DeGraaf</li>
! 					<li>Marco Gaiarin</li>
! 					<li>Md. Aftabuddin</li>
! 					<li>Michaes Herman</li>
! 					<li>Mike Johnson</li>
! 					<li>Mike Mylonas</li>
! 					<li>Nicolas Morin (French Translation in 2.0)</li>
! 					<li>Pawel Skuza (Polish for 1.2)</li>
! 					<li>Regula Sebastiao</li>
! 					<li>Roger Buck</li>
! 					<li>Ron Wickersham</li>
! 					<li>Sebastiaan Durand</li>
! 					<li><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</li></ul>					</td>
  				</tr>
  			</table>




From oleonard at users.sourceforge.net  Thu Jan 20 22:58:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:58:28 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrkJw-0002t8-8g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11078/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** auth_tag_structure.tmpl	20 Jan 2005 17:41:00 -0000	1.1.2.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:58:25 -0000	1.1.2.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 22:59:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:59:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1,1.2
Message-ID: <E1CrkKj-0002vv-VZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11254/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_tag_structure.tmpl	18 Jan 2005 22:53:04 -0000	1.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:59:15 -0000	1.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 23:40:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:40:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.2
Message-ID: <E1Crkyp-0005c3-Kw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21546/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:40:40 -0000	1.2
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:41:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.1.2.1
Message-ID: <E1CrkzH-0005eo-6g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:41:08 -0000	1.1.2.1
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:48:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:48:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,NONE,1.1.2.1
Message-ID: <E1Crl6O-000687-Ur@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23551/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
      Tag: rel_2_2
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<div class="tabitem"><form action="MARCdetail.pl" method="get">
<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
</div>

	<div class="isbd">
		<p><!-- TMPL_VAR NAME="ISBD" --></p>
	</div>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 23:51:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:51:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,1.1,1.2
Message-ID: <E1Crl9J-0006PF-7p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block





From acli at users.sourceforge.net  Sun Jan 23 05:31:24 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:31:24 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.html,1.2,1.2.2.1 translator_doc.txt,1.6,1.6.2.1
Message-ID: <E1CsZPI-0007EL-Fu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27739

Modified Files:
      Tag: rel_2_2
	translator_doc.html translator_doc.txt 
Log Message:
Minor updates


Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** translator_doc.html	30 Dec 2004 06:58:19 -0000	1.2
--- translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
***************
*** 4,8 ****
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts:
  
  <ul>
--- 4,9 ----
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts
! (with a number of associated perl module files):
  
  <ul>
***************
*** 28,32 ****
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
--- 29,33 ----
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
***************
*** 41,45 ****
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>
--- 42,46 ----
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>
***************
*** 55,65 ****
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your new css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed
--- 56,66 ----
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your newly updated css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
--- translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
***************
*** 3,7 ****
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts:
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
--- 3,7 ----
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts (with a number of associated perl module files):
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
***************
*** 22,26 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,27 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 33,37 ****
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 34,40 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 44,48 ****
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 47,52 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 50,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
-  
- REBUILD ALL
- ===========
- The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
- Useful for developpers, probably useless for all end-users.
- 
  
  WEAKNESSES
--- 54,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
***************
*** 71,73 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file
--- 71,74 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 




From acli at users.sourceforge.net  Sun Jan 23 05:58:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:58:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1.2.1,1.1.2.2
Message-ID: <E1CsZph-0000MQ-LC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1353

Modified Files:
      Tag: rel_2_2
	Makefile 
Log Message:
Forgot to take out this debugging code


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
--- Makefile	23 Jan 2005 04:58:39 -0000	1.1.2.2
***************
*** 2,6 ****
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:
--- 2,6 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:




From acli at users.sourceforge.net  Sun Jan 23 05:57:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:57:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1,1.1.2.1 translator_doc.html,1.2.2.1,1.2.2.2 translator_doc.txt,1.6.2.1,1.6.2.2
Message-ID: <E1CsZow-0000JI-UF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv985

Modified Files:
      Tag: rel_2_2
	Makefile translator_doc.html translator_doc.txt 
Log Message:
Minor corrections & clarifications, and make the command line examples
not break in the middle (like in the original version)


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** Makefile	30 Dec 2004 06:48:19 -0000	1.1
--- Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
***************
*** 2,4 ****
  
  %.txt: %.html
! 	LANG=C w3m $< > $@
--- 2,7 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
! 
! clean:
! 	rm translator_doc.txt

Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
--- translator_doc.html	23 Jan 2005 04:57:51 -0000	1.2.2.2
***************
*** 7,18 ****
  (with a number of associated perl module files):
  
! <ul>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ul>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories)
!     <li>update an existing translation file.
!     <li>rebuild translated templates from english & translation file.
      </ul>
  </ul>
--- 7,18 ----
  (with a number of associated perl module files):
  
! <ol>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script; and
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ol type=a>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories),
!     <li>update an existing translation file, and
!     <li>rebuild translated templates from English & translation file.
      </ul>
  </ul>
***************
*** 35,41 ****
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended
!     but is not necessary;
!     it makes the resulting PO files somewhat easier to read.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
--- 35,43 ----
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended;
!     it makes the resulting PO files slightly shorter
!     and more usable in a team environment.
!     Absolute paths are certainly fine,
!     and might be better if there is only one translator for your language.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
***************
*** 52,56 ****
  
  <p>
! If something changes in English version:
  <ol>
  <li>Update your translation file:
--- 54,58 ----
  
  <p>
! If something changes in the English version:
  <ol>
  <li>Update your translation file:

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
--- translator_doc.txt	23 Jan 2005 04:57:51 -0000	1.6.2.2
***************
*** 5,15 ****
  2 scripts (with a number of associated perl module files):
  
!   * xgettext.pl, that extracts the texts in a template, and which is called by
!     the script
!   * tmpl_process3.tmpl, which can do 3 things:
!       + create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories)
!       + update an existing translation file.
!       + rebuild translated templates from english & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
--- 5,15 ----
  2 scripts (with a number of associated perl module files):
  
!  1. xgettext.pl, that extracts the texts in a template, and which is called by
!     the script; and
!  2. tmpl_process3.tmpl, which can do 3 things:
!      a. create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories),
!      b. update an existing translation file, and
!      c. rebuild translated templates from English & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
***************
*** 21,41 ****
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
!    
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
!    
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended but is not necessary; it makes the
!     resulting PO files somewhat easier to read.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
!    
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
--- 21,40 ----
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
! 
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended; it makes the resulting PO files slightly
!     shorter and more usable in a team environment. Absolute paths are certainly
!     fine, and might be better if there is only one translator for your
!     language.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
***************
*** 43,61 ****
      tmpl_process3.pl install).
  
! If something changes in English version:
  
   1. Update your translation file:
!    
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
!    
!  2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
!     "fuzzy" and strings that are not translated.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
!    
   4. Copy new images/css files in your new directory if needed
  
--- 42,57 ----
      tmpl_process3.pl install).
  
! If something changes in the English version:
  
   1. Update your translation file:
! 
!         ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
!  2. Translate your newly updated css_opac_fr_FR.po file. Look for strings
!     marked as "fuzzy" and strings that are not translated.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
   4. Copy new images/css files in your new directory if needed
  




From acli at users.sourceforge.net  Sun Jan 23 06:16:18 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 21:16:18 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.3,1.1.2.4
Message-ID: <E1Csa6k-0001Gt-8L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4100

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Added a --pot option to generate the POT (PO template) file.

The POT files are currently named like css_opac_en_EN.po, which
are not what they would usually be named.


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
--- update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
***************
*** 6,12 ****
  use strict;
  use integer;
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
  # Remember whether we see the "po" directory; this is used later to guess
--- 6,22 ----
  use strict;
  use integer;
+ use Getopt::Long;
+ 
+ use vars qw( $pot_p );
+ 
+ GetOptions(
+    '--pot' => \$pot_p,
+ ) || exit(1);
  
  my $lang = $ARGV[0];
! die <<EOF unless $pot_p || $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
! Usage: $0 LANG
!        $0 --pot
! EOF
  
  # Remember whether we see the "po" directory; this is used later to guess
***************
*** 32,38 ****
  
        # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
  
        die "tmpl_process3.pl: exec: $!\n";
--- 42,54 ----
  
        # Now call tmpl_process3.pl to do the real work
!       #
!       # Traditionally, the pot file should be named PACKAGE.pot
!       # (for Koha probably something like koha_intranet_css.pot),
!       # but this is not Koha's convention.
!       #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
!       exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', $target, '-r');
  
        die "tmpl_process3.pl: exec: $!\n";




From acli at users.sourceforge.net  Sun Jan 23 07:15:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:15:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6,1.6.2.1
Message-ID: <E1Csb1z-0004dd-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17798

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po 
Log Message:
Minor syntactical corrections


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
--- css_opac_fr_FR.po	23 Jan 2005 06:15:24 -0000	1.6.2.1
***************
*** 1,17 ****
! # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
! "Language-Team: Cymraeg <cy at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8-bit\n"
- "X-Generator: Kartouche 0.2 - 28 October 2003\n"
  "\n"
  
--- 1,17 ----
! # Koha OPAC module, French translation
! # Copyright (C) 2000-2005 Katipo Communications
! # This file is distributed under the same license as the Koha package.
! # Copyright 2004-2005 French translation team
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: koha-opac 2.2\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: Paul POULAIN <tipaul at users.sourceforge.net>\n"
! "Language-Team: French <fr at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8-bit\n"
  "\n"
  
***************
*** 284,289 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
--- 284,288 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s"
  
  #. For the first occurrence, 
***************
*** 1966,1970 ****
  #~ msgid "ISBD : %s" 
  #~ msgstr "ISBD : %s"
- msgid ""
- msgstr ""
- 
--- 1965,1966 ----




From acli at users.sourceforge.net  Sun Jan 23 07:17:07 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:07 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,NONE,1.1.2.1
Message-ID: <E1Csb3b-0004iD-ID@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18025

Added Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Translation progress statistics script borrowed from gaim


--- NEW FILE ---
#!/usr/bin/perl

# Copyright 2003-2004 Nathan Walp <faceprint at faceprint.com>
# Adapted for Koha by Ambrose Li <acli at ada.dhs.org>
#
# This program 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.
#
# This program 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 this program; if not, write to the Free Software
# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307  USA
#


my $PACKAGE="koha";


use Locale::Language;

$lang{en_AU} = "English (Australian)";
$lang{en_CA} = "English (Canadian)";
$lang{en_GB} = "English (British)";
$lang{es_AR} = "Spanish (Argentinian)";
$lang{fr_FR} = "French"; # FIXME: should be just "fr"
$lang{my_MM} = "Burmese (Myanmar)";
$lang{pl_PL} = "Polish"; # FIXME: should be just "pl"
$lang{pt_BR} = "Portuguese (Brazilian)";
$lang{'sr at Latn'} = "Serbian (Latin)";
$lang{zh_CN} = "Chinese (Simplified)";
$lang{zh_TW} = "Chinese (Traditional)";

$ENV{LANG} = $ENV{LC_ALL} = 'C';

opendir(DIR, ".") || die "can't open directory: $!";
@pos = grep { /\.po$/ && -f } readdir(DIR);
foreach (@pos) { s/\.po$//; };
closedir DIR;

@pos = sort @pos;

$now = `date`;

#system("./update.pl --pot > /dev/null");

print "<html>\n";
print "<head><title>$PACKAGE i18n statistics</title></head>\n";
print "<body>\n";

opendir(DIR, ".") || die "can't open directory: $!";
@templates = grep { /\.pot$/ && -f } readdir(DIR);
foreach (@templates) { s/\.pot$//; };
closedir DIR;
for my $PACKAGE (sort {
	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
	    $module1 cmp $module2 && $theme1 cmp $theme2
	} @templates) {
    my @pos_orig = @pos;
    my @pos = grep { /^${PACKAGE}_/ } @pos_orig;
    my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;

$_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;

die "unable to get total: $!" unless (/(\d+) untranslated messages/);

$total = $1;

print "<h1>Module $module, theme $theme</h1>\n";
print "<table cellspacing='0' cellpadding='0' border='0' bgcolor='#888888' width='100%'><tr><td><table cellspacing='1' cellpadding='2' border='0' width='100%'>\n";

print"<tr bgcolor='#e0e0e0'><th>language</th><th style='background: #339933;'>trans</th><th style='background: #339933;'>%</th><th style='background: #333399;'>fuzzy</th><th style='background: #333399;'>%</th><th style='background: #dd3333;'>untrans</th><th style='background: #dd3333;'>%</th><th>&nbsp;</th></tr>\n";

foreach $index (0 .. $#pos) {
	$trans = $fuzz = $untrans = 0;
	$po = $pos[$index];
	next if $po =~ /_en_EN/; # Koha-specific
	print STDERR "$po..." if($ARGV[0] eq '-v');
	system("msgmerge $po.po $PACKAGE.pot -o $po.new 2>/dev/null");
	$_ = `msgfmt --statistics $po.new -o /dev/null 2>&1`;
	chomp;
	if(/(\d+) translated message/) { $trans = $1; }
	if(/(\d+) fuzzy translation/) { $fuzz = $1; }
	if(/(\d+) untranslated message/) { $untrans = $1; }
	$transp = 100 * $trans / $total;
	$fuzzp = 100 * $fuzz / $total;
	$untransp = 100 * $untrans / $total;
	if($index % 2) {
		$color = " bgcolor='#e0e0e0'";
	} else {
		$color = " bgcolor='#d0e0ff'";
	}
	my $lang = $1 if $po =~ /^${PACKAGE}_(.*)$/; # Koha-specific
	$name = "";
	$name = $lang{$lang}; # NOTE
	$name = code2language($lang) unless $name ne ""; # NOTE
	$name = "???" unless $name ne "";
	printf "<tr$color><td>%s(%s.po)</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>",
	$name, $po, $trans, $transp, $fuzz, $fuzzp, $untrans, $untransp;
	printf "<img src='bar_g.gif' height='15' width='%0.0f' />", $transp*2
	unless $transp*2 < 0.5;
	printf "<img src='bar_b.gif' height='15' width='%0.0f' />", $fuzzp*2
	unless $fuzzp*2 < 0.5;
	printf "<img src='bar_r.gif' height='15' width='%0.0f' />", $untransp*2
	unless $untransp*2 < 0.5;
	print "</tr>\n";
	unlink("$po.new");
	print STDERR "done ($untrans untranslated strings).\n" if($ARGV[0] eq '-v');
}
print "</table></td></tr></table>\n";
print "Latest $PACKAGE.pot generated $now: <a href='$PACKAGE.pot'>$PACKAGE.pot</a><br />\n";
}
print "</body>\n";
print "</html>\n";





From acli at users.sourceforge.net  Sun Jan 23 07:17:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.1,1.1.2.2
Message-ID: <E1Csb4M-0004jp-MF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to re-enable update.pl


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** stats.pl	23 Jan 2005 06:17:05 -0000	1.1.2.1
--- stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
***************
*** 48,52 ****
  $now = `date`;
  
! #system("./update.pl --pot > /dev/null");
  
  print "<html>\n";
--- 48,52 ----
  $now = `date`;
  
! system("./update.pl --pot > /dev/null");
  
  print "<html>\n";




From acli at users.sourceforge.net  Sun Jan 23 07:22:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:22:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Csb8n-0004vm-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18923

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
create fails if the pot file already exists


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
--- update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
***************
*** 48,51 ****
--- 48,52 ----
        #
        my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
+       rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",




From acli at users.sourceforge.net  Sun Jan 23 07:49:11 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:49:11 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator xgettext.pl,1.13,1.13.2.1
Message-ID: <E1CsbYd-0006NV-7x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24427

Modified Files:
      Tag: rel_2_2
	xgettext.pl 
Log Message:
I think I know where the spurious leading spaces are from now
But there is no fix yet


Index: xgettext.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** xgettext.pl	30 Dec 2004 06:48:20 -0000	1.13
--- xgettext.pl	23 Jan 2005 06:49:08 -0000	1.13.2.1
***************
*** 462,468 ****
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! It sometimes generates strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.  The cause of this is not yet known.
  
  =cut
--- 462,469 ----
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! If a Javascript string has leading spaces, it will
! generate strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.
  
  =cut




From acli at users.sourceforge.net  Sun Jan 23 08:05:51 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 23:05:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35,1.35.2.1
Message-ID: <E1Csbol-0007Ab-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27541

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
This should fix bug 913


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** TmplTokenizer.pm	30 Dec 2004 06:53:13 -0000	1.35
--- TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,353 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;
--- 349,354 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Sun Jan 23 09:16:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:16:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.5,1.1.2.6
Message-ID: <E1Cscvb-000249-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7900

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Forgot a _ in the po file filename


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
--- update.pl	23 Jan 2005 08:16:57 -0000	1.1.2.6
***************
*** 47,51 ****
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
--- 47,51 ----
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "_$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),




From acli at users.sourceforge.net  Sun Jan 23 09:17:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:17:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4,1.4.2.1 default_intranet_zh_TW.po,1.4,1.4.2.1
Message-ID: <E1Cscw5-00026C-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7991

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Partial updates


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** css_opac_zh_TW.po	30 Dec 2004 09:37:19 -0000	1.4
--- css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2004-12-30 02:06-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
[...2271 lines suppressed...]
+ #~ msgstr "%s (%s本書)"
+ 
  #~ msgid "%s <b>acquired in the last %S days</b>"
  #~ msgstr "<b>最近%2$S日內新到的</b>%1$s"
  
+ #~ msgid "%s(%s books)"
+ #~ msgstr "%s(%s本書)"
+ 
  #~ msgid "<b>ISBN:</b><a1>%s</a>"
  #~ msgstr "<b>國際標準書號：</b><a1>%s</a>"
***************
*** 2089,2095 ****
  #~ msgstr "青年小說類"
  
- #~ msgid "text/html; charset=iso-8859-1"
- #~ msgstr "text/html; charset=UTF-8"
- 
  #~ msgid "to Koha"
  #~ msgstr "Koha"
--- 2209,2212 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** default_intranet_zh_TW.po	30 Dec 2004 10:29:28 -0000	1.4
--- default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2004-12-30 04:23-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...5497 lines suppressed...]
***************
*** 21830,21833 ****
--- 21960,21966 ----
  #~ msgstr "電話：%s，傳真：%s"
  
+ #~ msgid "Pierre Cauchois (Esiee School)"
+ #~ msgstr "Pierre Cauchois (ESIEE學院)"
+ 
  #~ msgid "Previous"
  #~ msgstr "上一頁"
***************
*** 21843,21849 ****
  #~ msgstr "還書日期"
  
- #~ msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
- #~ msgstr "Rachel Hamilton-Williams (總經理兼網站管理人)"
- 
  #  NOTE 譯文更動 by Arthur
  #  NOTE 譯文更動 by Ambrose
--- 21976,21979 ----




From acli at users.sourceforge.net  Sun Jan 23 09:59:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:59:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.2,1.1.2.3
Message-ID: <E1Csdav-00042t-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15497

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to remove some other debugging code
Fixed the sorting order


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
--- stats.pl	23 Jan 2005 08:59:39 -0000	1.1.2.3
***************
*** 61,65 ****
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    $module1 cmp $module2 && $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
--- 61,65 ----
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    return $module1 cmp $module2 || $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
***************
*** 67,71 ****
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);
--- 67,71 ----
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);




From acli at users.sourceforge.net  Sun Jan 23 11:51:21 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 02:51:21 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.20,1.20.2.1
Message-ID: <E1CsfKz-0001ng-IF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6839

Modified Files:
      Tag: rel_2_2
	tmpl_process3.pl 
Log Message:
Make the generated pot file (i.e., result of "create") look more "real",
but using msgmerge to reformat the output


Index: tmpl_process3.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -r1.20 -r1.20.2.1
*** tmpl_process3.pl	10 Mar 2004 07:00:28 -0000	1.20
--- tmpl_process3.pl	23 Jan 2005 10:51:16 -0000	1.20.2.1
***************
*** 263,276 ****
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph, $tmpfile) = tmpnam();
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph "$input\n";
      }
!     close $tmph;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file);
!     warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0;
! #   unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {
--- 263,301 ----
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph1, $tmpfile1) = tmpnam();
!     my($tmph2, $tmpfile2) = tmpnam();
!     close $tmph2; # We just want a name
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph1 "$input\n";
      }
!     close $tmph1;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2);
!     # Run msgmerge so that the pot file looks like a real pot file
!     # We need to help msgmerge a bit by pre-creating a dummy po file that has
!     # the headers and the "" msgid & msgstr. It will fill in the rest.
!     if ($st == 0) {
! 	# Merge the temporary "pot file" with the specified po file ($str_file)
! 	# FIXME: msgmerge(1) is a Unix dependency
! 	# FIXME: need to check the return value
! 	unless (-f $str_file) {
! 	    local(*INPUT, *OUTPUT);
! 	    open(INPUT, "<$tmpfile2");
! 	    open(OUTPUT, ">$str_file");
! 	    while (<INPUT>) {
! 		print OUTPUT;
! 	    last if /^\n/s;
! 	    }
! 	    close INPUT;
! 	    close OUTPUT;
! 	}
! 	$st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2);
!     } else {
! 	error_normal "Text extraction failed: $xgettext: $!\n", undef;
! 	error_additional "Will not run msgmerge\n", undef;
!     }
! #   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
! #   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {




From acli at users.sourceforge.net  Mon Jan 24 03:47:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 18:47:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1CsuGb-0007dh-3v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29279

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Partial update. This should be reasonably "finished".


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
***************
*** 223,227 ****
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "【<a1>%s之個人主頁</a>】【<a2>登出</a>】"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
--- 223,227 ----
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "<a1>%s 之個人主頁</a>　<a2>登出</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1> 簡要 </a> <a2> 詳盡 </a> <a3> ISBD </a> <a4> 新增至虛擬書架 </a> "
! "<a5> 列印 </a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　"
! "<a5>列印</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 614,624 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
--- 614,625 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr "任何人都有權管理公家書架。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr "任何人都可以看見公開的私人書架，但只有您有權管理"
  
+ #  FIXME grammatical mistake in original ("every words")
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
***************
*** 628,631 ****
--- 629,633 ----
  "will be discarded."
  msgstr ""
+ "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 649,656 ****
  msgstr "採購日期"
  
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr ""
  
  #. INPUT type=submit
--- 651,659 ----
  msgstr "採購日期"
  
+ #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr "把點選的項目放至書籃"
  
  #. INPUT type=submit
***************
*** 679,683 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
--- 682,686 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr "新增至書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
***************
*** 716,722 ****
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
- #, fuzzy
  msgid "Any word"
! msgstr "關鍵詞"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
--- 719,724 ----
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
  msgid "Any word"
! msgstr "任何字詞"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
***************
*** 783,803 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "Biblio(s) added"
! msgstr "沒有新增書目記錄"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
--- 785,805 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr "書籃是空的"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr "書目已放在書籃內"
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr "書籃"
  
+ # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio(s) added"
! msgstr "成功新增書目"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
***************
*** 881,887 ****
  msgstr "館藏：%s"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
--- 883,890 ----
  msgstr "館藏：%s"
  
+ #  NOTE 虛擬書架內含多少本書 (shelfbookcount)
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr "書目數量"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
***************
*** 931,940 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr ""
  
  # NOTE 譯文更動 by Arthur
--- 934,943 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr "要清空書籃嗎？"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr "要移除點選的書目嗎？"
  
  # NOTE 譯文更動 by Arthur
***************
*** 968,974 ****
  "將會收到電郵通知。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 971,978 ----
  "將會收到電郵通知。"
  
+ #  NOTE
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "過濾條件："
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
--- 990,994 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr "公家書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
***************
*** 996,1000 ****
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
--- 1000,1004 ----
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr "您好！這是 %s 送來的書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
***************
*** 1034,1037 ****
--- 1038,1042 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
+ "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two tower*」會找到「the two towers」、「two white towers」及「a tower and two cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1195,1199 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
--- 1200,1204 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr "未有點選書目"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
***************
*** 1244,1248 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr ""
  
  # NOTE 譯文更動 by Arthur
--- 1249,1253 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr "線上目錄書籃"
  
  # NOTE 譯文更動 by Arthur
***************
*** 1273,1285 ****
  msgstr "其他選項"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
- #, fuzzy
  msgid "Partial search"
! msgstr "館藏查詢"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
--- 1278,1290 ----
  msgstr "其他選項"
  
+ #  NOTE 暫譯
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr "架主"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
  msgid "Partial search"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
***************
*** 1329,1337 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
--- 1334,1342 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr "私家書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr "送出書籃途中出現問題……"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
--- 1346,1350 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr "公開的私人書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
***************
*** 1514,1519 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
--- 1519,1525 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr "送出書籃中"
  
+ #  FIXME 這個，看了原始碼也不明白是什麼
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
***************
*** 1521,1525 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=serial
--- 1527,1531 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr "期刊期數"
  
  #. %1$s: TMPL_VAR name=serial
***************
*** 1536,1540 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
--- 1542,1546 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr "設定過濾條件"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
***************
*** 1651,1655 ****
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=reservecount
--- 1657,1661 ----
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr "書籃已送給：%s"
  
  #. %1$s: TMPL_VAR name=reservecount
***************
*** 1671,1675 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
--- 1677,1681 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr "這個書目已在書籃內"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
***************
*** 1867,1871 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1873,1877 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr "您的書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1876,1890 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr ""
  
- # NOTE This refers to new books acquired in the last so-and-so days
- # NOTE This is essentially the same string as the next, but different
- # NOTE due to technical difficulties (in creating an msgid from the HTML)
- # FIXME This string as it is is nearly untranslatable. The scanner need to be fixed.
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
--- 1882,1891 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "私家書籃由您自己管理，也只有您才看見。"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "already in the basket"
! msgstr "已在書籃內"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
***************
*** 1925,1931 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
- #, fuzzy
  msgid "in"
! msgstr "讀者登記"
  
  #. IMG
--- 1926,1931 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
  msgid "in"
! msgstr "在"
  
  #. IMG
***************
*** 2055,2061 ****
  #~ msgstr "<b>國際標準書號：</b><a1>%s</a>"
  
- #~ msgid "<em><a1>%s (%s)</a></em>"
- #~ msgstr "<em><a1>%s (%s)</a></em>"
- 
  #~ msgid "AMOUNT"
  #~ msgstr "金額"
--- 2055,2058 ----
***************
*** 2064,2073 ****
  #~ msgstr "紀錄正確嗎？"
  
- #~ msgid "Apr"
- #~ msgstr "四月"
- 
- #~ msgid "Aug"
- #~ msgstr "八月"
- 
  #~ msgid "Compact Disc"
  #~ msgstr "光碟"
--- 2061,2064 ----
***************
*** 2077,2086 ****
  #~ msgstr "目前狀態"
  
- #~ msgid "Day"
- #~ msgstr "日"
- 
- #~ msgid "Dec"
- #~ msgstr "十二月"
- 
  #~ msgid "Easy / Picture Books"
  #~ msgstr "淺易/圖畫書"
--- 2068,2071 ----
***************
*** 2100,2118 ****
  #~ msgstr "罰款及費用"
  
- #~ msgid "Feb"
- #~ msgstr "二月"
- 
  #~ msgid "Illustrator"
  #~ msgstr "繪圖"
  
- #~ msgid "Jan"
- #~ msgstr "一月"
- 
- #~ msgid "Jul"
- #~ msgstr "七月"
- 
- #~ msgid "Jun"
- #~ msgstr "六月"
- 
  # NOTE 譯文更動 by Arthur
  #~ msgid "Junior Fiction"
--- 2085,2091 ----
***************
*** 2123,2138 ****
  #~ msgstr "學童/初級非小說"
  
- #~ msgid "KOHA"
- #~ msgstr "KOHA"
- 
  #~ msgid "KOHA: OPAC Catalogue Search"
  #~ msgstr "KOHA：查詢館藏"
  
- #~ msgid "Log In to Koha"
- #~ msgstr "登入Koha"
- 
- #~ msgid "Mar"
- #~ msgstr "三月"
- 
  #~ msgid "Next Page"
  #~ msgstr "下一頁"
--- 2096,2102 ----
***************
*** 2155,2161 ****
  #~ "鍵字。"
  
- #~ msgid "Nov"
- #~ msgstr "十一月"
- 
  #~ msgid "OR :"
  #~ msgstr "或："
--- 2119,2122 ----
***************
*** 2164,2170 ****
  #~ msgstr "或下列最少一項："
  
- #~ msgid "Oct"
- #~ msgstr "十月"
- 
  #~ msgid "Previous Page"
  #~ msgstr "上一頁"
--- 2125,2128 ----
***************
*** 2186,2192 ****
  #~ msgstr "稱號"
  
- #~ msgid "Sep"
- #~ msgstr "九月"
- 
  # NOTE 譯文更動 by Arthur
  #~ msgid "Something new ?"
--- 2144,2147 ----
***************
*** 2208,2212 ****
  #~ msgid "Young Adult Fiction"
  #~ msgstr "青年小說類"
- 
- #~ msgid "to Koha"
- #~ msgstr "Koha"
--- 2163,2164 ----




From acli at users.sourceforge.net  Mon Jan 24 05:43:23 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:43:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1,1.1.2.1
Message-ID: <E1Csw4R-0006ip-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling corrections


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_126a.tmpl	7 Jun 2004 10:04:00 -0000	1.1
--- unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
***************
*** 498,502 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 498,502 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 584,588 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 584,588 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 670,674 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 670,674 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 756,760 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 756,760 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 842,846 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 842,846 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 928,932 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 928,932 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>





From acli at users.sourceforge.net  Mon Jan 24 05:45:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:45:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1Csw6R-0006rD-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26187

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial updates, mostly Unimarc stuff
(CMARC seems to be mostly identical to French Unimarc)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
***************
*** 141,145 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr ""
  
  #. For the first occurrence,
--- 141,145 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」……)"
  
[...961 lines suppressed...]
--- 3685,3690 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:369
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:371
  msgid "Autre"
! msgstr "其他"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:218
***************
*** 3863,3867 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500
--- 3868,3872 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr "其他史料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500




From acli at users.sourceforge.net  Mon Jan 24 06:43:12 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:43:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Csx0K-00028G-Da@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8182

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
--- unimarc_field_126a.tmpl	24 Jan 2005 05:43:10 -0000	1.1.2.2
***************
*** 490,494 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

--- 490,494 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

***************
*** 576,580 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

--- 576,580 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

***************
*** 662,666 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

--- 662,666 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

***************
*** 748,752 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

--- 748,752 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

***************
*** 834,838 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

--- 834,838 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

***************
*** 920,924 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->

--- 920,924 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->





From acli at users.sourceforge.net  Mon Jan 24 06:53:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:53:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.2,1.4.2.3 default_intranet_zh_TW.po,1.4.2.2,1.4.2.3
Message-ID: <E1CsxA2-0002fc-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
126a mostly done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
--- css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　"
! "<a5>列印</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　<a5>列印</"
! "a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 629,633 ****
  "will be discarded."
  msgstr ""
! "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
--- 629,635 ----
  "will be discarded."
  msgstr ""
! "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您"
! "在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」"
! "二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 1038,1042 ****
  "towers\", \"a tower and two cities\""
  msgstr ""
! "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two tower*」會找到「the two towers」、「two white towers」及「a tower and two cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1040,1046 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
! "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two "
! "tower*」會找到「the two towers」、「two white towers」及「a tower and two "
! "cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1411,1416 ****
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "請注意，圖書資料的題名可能是關於一個著者（例如 Victor Hugo）、一間公司、一個機構、"
! "或者一個組織（例如 CNRS、美國國會圖書館）等"
  
  #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
--- 1415,1420 ----
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "請注意，圖書資料的題名可能是關於一個著者（例如 Victor Hugo）、一間公司、一個"
! "機構、或者一個組織（例如 CNRS、美國國會圖書館）等"
  
  #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
***************
*** 1501,1505 ****
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "假如您只想查詢某一間分館的館藏，請先選擇分館；否則查詢結果會包括所有分館的館藏。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
--- 1505,1510 ----
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "假如您只想查詢某一間分館的館藏，請先選擇分館；否則查詢結果會包括所有分館的館"
! "藏。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
***************
*** 1815,1819 ****
  "illustrator...)"
  msgstr ""
! "您可以輸入著者的姓或名。附加著者及其他有關的欄位（譯者、繪圖等等）也會列入搜尋範圍之內。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
--- 1820,1825 ----
  "illustrator...)"
  msgstr ""
! "您可以輸入著者的姓或名。附加著者及其他有關的欄位（譯者、繪圖等等）也會列入搜"
! "尋範圍之內。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
--- default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...1012 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
--- 18929,18933 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:171
  msgid "Type de son:"
! msgstr "聲道類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
***************
*** 19568,19572 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "速度："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338
--- 19547,19551 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "錄音速度："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338




From acli at users.sourceforge.net  Mon Jan 24 07:32:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:32:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.3,1.4.2.4
Message-ID: <E1Csxly-0004vE-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18639

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
126b done (i.e., translations that can be copied from CMARC have been copied)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
***************
*** 1077,1081 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
--- 1077,1081 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr "3 7/8 × 2 1/2 吋（卡式錄音帶）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
***************
*** 1156,1164 ****
  msgstr "2 個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
- #, fuzzy
  msgid "2 pouces"
! msgstr "-> 資源"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
--- 1156,1164 ----
  msgstr "2 個月"
  
+ #  TODO CMARC 寫 f6e 為「1 吋」，但「1 吋」為 f6c，CMARC 文件有錯
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
  msgid "2 pouces"
! msgstr "2 吋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
***************
*** 3993,3997 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
--- 3993,3997 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr "母帶 (master tape)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
***************
*** 4075,4083 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
--- 4075,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr "複製母帶 (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr "複製母帶 (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
***************
*** 5685,5689 ****
  #, fuzzy
  msgid "Codage CX"
! msgstr "編碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
--- 5685,5689 ----
  #, fuzzy
  msgid "Codage CX"
! msgstr "CX 編碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
***************
*** 6372,6376 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
--- 6372,6376 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr "圓形錄音筒"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
***************
*** 7016,7020 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
--- 7016,7020 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr "唱片母模板 (disc master, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
***************
*** 7133,7137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
--- 7133,7137 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr "紙背 (paper backed)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
***************
*** 8632,8646 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
--- 8632,8646 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr "現場錄音者（定點錄音）(instantaneous)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr "側面切割式"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
***************
*** 8683,8693 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
- #, fuzzy
  msgid "Grec"
! msgstr "法文"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
--- 8683,8692 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr "高低式起伏"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
  msgid "Grec"
! msgstr "希臘文"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
***************
*** 8696,8700 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
--- 8695,8699 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr "格林尼治（英國）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
***************
*** 8718,8721 ****
--- 8717,8721 ----
  "Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
  msgstr ""
+ "Gynn Lomax、Richard Anderson、Jeremy Blake、Rebecca Holden、Olive T. Canine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:66
***************
*** 8724,8730 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
- #, fuzzy
  msgid "HELP Ordering"
! msgstr "採購說明："
  
  #  NOTE 譯文更動 by Arthur
--- 8724,8729 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
  msgid "HELP Ordering"
! msgstr "訂購說明"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 8744,8753 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
- #, fuzzy
  msgid "HINT for issues"
! msgstr "借出次數"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
--- 8743,8751 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr "罰款提示"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
  msgid "HINT for issues"
! msgstr "借出說明"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
***************
*** 10632,10638 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
- #, fuzzy
  msgid "Laque"
! msgstr "語言"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
--- 10630,10635 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
  msgid "Laque"
! msgstr "lacquered（如，醋酸鹽等）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
***************
*** 11496,11500 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
--- 11493,11497 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr "壓模版 (stamper, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
***************
*** 11504,11510 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
- #, fuzzy
  msgid "May"
! msgstr "繳交"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
--- 11501,11506 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
  msgid "May"
! msgstr "五月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
***************
*** 11720,11726 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
- #, fuzzy
  msgid "Metal"
! msgstr "男"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
--- 11716,11721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
  msgid "Metal"
! msgstr "金屬（如，鋁等）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
***************
*** 11736,11740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
--- 11731,11735 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr "金屬及塑膠（雷射唱片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
***************
*** 13197,13203 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
- #, fuzzy
  msgid "Nord"
! msgstr "字詞"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
--- 13192,13197 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
  msgid "Nord"
! msgstr "北"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
***************
*** 13220,13233 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
--- 13214,13229 ----
  msgstr ""
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr "CCIR/IEC 標準"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr "ISO "
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
***************
*** 13463,13466 ****
--- 13459,13463 ----
  msgstr ""
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:981
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:983
***************
*** 13468,13475 ****
  msgstr "數碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
--- 13465,13473 ----
  msgstr "數碼"
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr "數碼（雷射唱片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
***************
*** 14089,14093 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
--- 14087,14091 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr "塑膠 (PVC)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
***************
*** 14105,14116 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
- #, fuzzy
  msgid "Page Size"
! msgstr "大小"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
- #, fuzzy
  msgid "Page Type"
! msgstr "圖書資料類別"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
--- 14103,14112 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
  msgid "Page Size"
! msgstr "頁面大小"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
  msgid "Page Type"
! msgstr "紙張類型"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
***************
*** 14778,14781 ****
--- 14774,14778 ----
  msgstr ""
  
+ #  NOTE CMARC 126b 無 2h
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:365
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:367
***************
*** 14787,14791 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
--- 14784,14788 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr "塑膠"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
***************
*** 14961,14965 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
--- 14958,14962 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr "多元脂 (polyester)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
***************
*** 15132,15139 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15129,15137 ----
  msgstr ""
  
+ #  FIXME Clash between 126a and 130!!
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15150,15164 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr ""
  
  # FIXME This may be wrong. check context.
--- 15148,15162 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr "試壓片 (test pressing)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr "假漆版唱片（大量製造者）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr "塑膠版唱片（大量製造者）"
  
  # FIXME This may be wrong. check context.
***************
*** 15242,15246 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
--- 15240,15244 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr "大量製造者（商業性發行唱片多屬此）(mass produced)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
***************
*** 18891,18895 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
--- 18889,18893 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr "唱片、錄音帶或圓形錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
***************
*** 18899,18903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
--- 18897,18901 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr "質料種類："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
***************
*** 18911,18915 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9
--- 18909,18913 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr "錄音槽切割形式："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9




From acli at users.sourceforge.net  Mon Jan 24 07:53:56 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:53:56 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Csy6m-00067h-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23504

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
--- default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
***************
*** 19653,19659 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
- #, fuzzy
  msgid "Waited"
! msgstr "相關"
  
  #. INPUT type=submit
--- 19653,19658 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
  msgid "Waited"
! msgstr "等待"
  
  #. INPUT type=submit
***************
*** 19786,19794 ****
  msgstr "是"
  
- # FIXME Bug in English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
- #, fuzzy
  msgid "Year"
! msgstr "年%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
--- 19785,19791 ----
  msgstr "是"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
  msgid "Year"
! msgstr "年份"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
***************
*** 20023,20030 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
- #, fuzzy
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "「私人」的虛擬書架只有您看得見，並且只有您才有權修改。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
--- 20020,20027 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "私家書架只有您看得見，並且只有您才有權修改。"
  
+ #  FIXME bug in tokenizer/scanner
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
***************
*** 20053,20056 ****
--- 20050,20054 ----
  "Thompson,"
  msgstr ""
+ "及 Simon Blake、運作經理 Amanda Atkins、Olwen Williams、Finlay Thompson、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90
***************
*** 20088,20094 ****
  msgstr "截至此日 <i>(%s)</i>"
  
- #  XXX 暫譯，要問人核對
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/authorities/authorities.tmpl:1
- #, fuzzy
  msgid "authority help"
  msgstr "權威說明"
--- 20086,20090 ----
***************
*** 20101,20107 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
- #, fuzzy
  msgid "autre"
! msgstr "著者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
--- 20097,20102 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
  msgid "autre"
! msgstr "其他"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
***************
*** 20127,20131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "在第「-1」格 (即不顯示)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
--- 20122,20126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "在第「-1」格（即不顯示）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
***************
*** 20216,20222 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
- #, fuzzy
  msgid "catalogue details"
! msgstr "館藏查詢"
  
  #. For the first occurrence,
--- 20211,20216 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
  msgid "catalogue details"
! msgstr "目錄詳情"
  
  #. For the first occurrence,
***************
*** 20229,20235 ****
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
- #, fuzzy
  msgid "change status"
! msgstr "匯率"
  
  #. SCRIPT
--- 20223,20228 ----
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
  msgid "change status"
! msgstr "修改狀態"
  
  #. SCRIPT
***************
*** 20240,20246 ****
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, fuzzy, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr "%S - %s <a1>+</a>"
  
  #. INPUT type=reset name=reset
--- 20233,20239 ----
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr ""
  
  #. INPUT type=reset name=reset
***************
*** 20276,20282 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
- #, fuzzy
  msgid "count"
! msgstr "折扣"
  
  #. SCRIPT
--- 20269,20274 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
  msgid "count"
! msgstr "數量"
  
  #. SCRIPT
***************
*** 20286,20292 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
- #, fuzzy
  msgid "day"
! msgstr "繳交"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
--- 20278,20283 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
  msgid "day"
! msgstr "日"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
***************
*** 20376,20380 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
--- 20367,20371 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr "任何地方"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
***************
*** 20401,20407 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
- #, fuzzy
  msgid "filter"
! msgstr "印表機"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
--- 20392,20397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
  msgid "filter"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
***************
*** 20412,20418 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, fuzzy, c-format
  msgid "for branch = %s"
! msgstr "登記之館別：%s"
  
  #. %1$s: TMPL_VAR name=borrower_category
--- 20402,20408 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=borrower_category
***************
*** 20510,20514 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
- #, fuzzy
  msgid "ignored"
  msgstr "忽略"
--- 20500,20503 ----
***************
*** 20669,20673 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
  msgid "mandatory tags empty"
  msgstr "個必備欄沒有填寫"
--- 20658,20661 ----
***************
*** 20727,20733 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
- #, fuzzy
  msgid "month"
! msgstr "金額"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
--- 20715,20720 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
  msgid "month"
! msgstr "月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
***************
*** 20848,20852 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=name
--- 20835,20839 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr "或新增至新的虛擬書架"
  
  #. %1$s: TMPL_VAR name=name
***************
*** 20881,20887 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
- #, fuzzy
  msgid "plans"
! msgstr "Al Banks"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
--- 20868,20873 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
  msgid "plans"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
***************
*** 20899,20903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr ""
  
  #. SCRIPT
--- 20885,20889 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr "彈出通知"
  
  #. SCRIPT
***************
*** 20952,20958 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
- #, fuzzy
  msgid "quarter"
! msgstr "更新"
  
  #. SCRIPT
--- 20938,20943 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
  msgid "quarter"
! msgstr "季"
  
  #. SCRIPT
***************
*** 21045,21051 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, fuzzy, c-format
  msgid "see also : %s,"
! msgstr "參見"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
--- 21030,21036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, c-format
  msgid "see also : %s,"
! msgstr "參見：%s、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
***************
*** 21059,21065 ****
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, fuzzy, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1></a>%2$s 的購物籃 %1$s"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
--- 21044,21050 ----
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1>%2$s</a> 的購物籃 <b>%1$s</b>"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
***************
*** 21090,21096 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
- #, fuzzy
  msgid "subfield ignored"
! msgstr "分欄"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
--- 21075,21080 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
  msgid "subfield ignored"
! msgstr "分欄已被忽略"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
***************
*** 21159,21163 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype欄必須："
  
  #  NOTE 譯文更動 by Arthur
--- 21143,21147 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype 欄必須："
  
  #  NOTE 譯文更動 by Arthur
***************
*** 21185,21193 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch欄必須："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch欄必須"
  
  #  NOTE 譯文更動 by Arthur
--- 21169,21177 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch 欄必須："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch 欄必須"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 21289,21293 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "週刊"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
--- 21273,21277 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "週"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
***************
*** 21309,21313 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "年刊"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
--- 21293,21297 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "年"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16




From acli at users.sourceforge.net  Mon Jan 24 08:13:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:13:57 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35.2.1,1.35.2.2
Message-ID: <E1CsyQ9-0007JT-Mu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28051

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
Reverting the patch


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C2 -r1.35.2.1 -r1.35.2.2
*** TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
--- TmplTokenizer.pm	24 Jan 2005 07:13:54 -0000	1.35.2.2
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,354 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;
--- 349,353 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Mon Jan 24 08:57:40 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:57:40 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.3,1.4.2.4 default_intranet_zh_TW.po,1.4.2.5,1.4.2.6
Message-ID: <E1Csz6S-0001Mu-6P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5164

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Unimarc tag 130 done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 18,21 ****
--- 18,28 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ # TODO
+ #. SCRIPT
+ #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+ #, fuzzy
+ msgid " Biblio(s) added"
+ msgstr "成功新增書目"
+ 
  #. %1$S: type=text name=value
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
***************
*** 799,808 ****
  msgstr "書籃"
  
- # TODO
- #. SCRIPT
- #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- msgid "Biblio(s) added"
- msgstr "成功新增書目"
- 
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
  msgid "Bookshelves"
--- 806,809 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
--- default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 34,37 ****
--- 34,52 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory fields empty (see bold subfields)"
+ msgstr "個必備欄位沒有填寫（見粗體的分欄）"
+ 
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory tags empty"
+ msgstr "個必備欄沒有填寫"
+ 
  #. %1$s: TMPL_VAR name=subject
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:6
***************
*** 81,85 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
--- 96,100 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
***************
*** 91,95 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
--- 106,110 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
***************
*** 107,111 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
--- 122,126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr "#230||{ ; 230a}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
***************
*** 117,121 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
--- 132,136 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr "#700|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
***************
*** 135,139 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr ""
  
  #. %1$S: type=text name=seealso
--- 150,154 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」)"
  
  #. %1$S: type=text name=seealso
***************
*** 736,740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:55
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:56
- #, fuzzy
  msgid "&nbsp;No results found."
  msgstr "　找不到您需用的資料。"
--- 751,754 ----
***************
*** 784,788 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:17
- #, fuzzy
  msgid ""
  "(Note : fines are calculated by the fines2.pl script, located in misc "
--- 798,801 ----
***************
*** 818,824 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, fuzzy, c-format
  msgid "(is %s)"
! msgstr "(%s, %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
--- 831,837 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, c-format
  msgid "(is %s)"
! msgstr "(為 %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
***************
*** 971,982 ****
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
- #, fuzzy
  msgid "1/2 Monthes"
! msgstr "個月%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
--- 984,994 ----
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
  msgid "1/2 Monthes"
! msgstr "半個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr "半個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
***************
*** 989,993 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
--- 1001,1005 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr "半季"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
***************
*** 995,999 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
--- 1007,1011 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr "半週"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
***************
*** 1001,1005 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "1/2 年"
  
  # FIXME looks like a BUG in the English template
--- 1013,1017 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "半年"
  
  # FIXME looks like a BUG in the English template
***************
*** 1082,1086 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
--- 1094,1098 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr "105 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
***************
*** 1134,1138 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
--- 1146,1150 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr "16 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
***************
*** 1211,1215 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
--- 1223,1227 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr "3 × 5 吋（8 × 13 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
***************
*** 1236,1240 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
--- 1248,1252 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr "35 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
***************
*** 1251,1255 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
--- 1263,1267 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr "4 × 6 吋（11 × 15 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
***************
*** 1296,1300 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
--- 1308,1312 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr "6 × 9 吋（16 × 23 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
***************
*** 1331,1335 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
--- 1343,1347 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr "70 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
--- 1353,1357 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr "8 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
***************
*** 1358,1365 ****
  msgstr "8/10 吋/秒"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr ""
  
  #. For the first occurrence,
--- 1370,1378 ----
  msgstr "8/10 吋/秒"
  
+ #  NOTE CMARC 亂寫 :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr "3 1/4 × 7 3/8 吋（9 × 19 公分）（孔卡）"
  
  #. For the first occurrence,
***************
*** 4066,4070 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
--- 4079,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr "長條微縮片 (microfilm slip)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
***************
*** 5019,5023 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
--- 5032,5036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr "孔卡 (aperture card)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
***************
*** 6070,6074 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
--- 6083,6087 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr "發行片 (service copy)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
***************
*** 6156,6167 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
- #, fuzzy
  msgid "Couleur"
! msgstr "重設"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
- #, fuzzy
  msgid "Couleur:"
! msgstr "重設"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
--- 6169,6178 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
  msgid "Couleur"
! msgstr "彩色 (color)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
  msgid "Couleur:"
! msgstr "色彩："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
***************
*** 6919,6923 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
--- 6930,6934 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr "重氮 (diazo)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
***************
*** 6957,6961 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
--- 6968,6972 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr "大小尺寸："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
***************
*** 7027,7033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
- #, fuzzy
  msgid "Divers"
! msgstr "-> 交貨"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
--- 7038,7043 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
  msgid "Divers"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
***************
*** 7405,7409 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
--- 7415,7419 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr "高縮率（31–60倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
***************
*** 7424,7433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
--- 7434,7443 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr "軟片感光乳劑性質："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
***************
*** 7910,7916 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
- #, fuzzy
  msgid "Faible reduction"
! msgstr "複製品"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
--- 7920,7925 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
  msgid "Faible reduction"
! msgstr "低縮率"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
***************
*** 8489,8500 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
- #, fuzzy
  msgid "Generation (copies):"
! msgstr "一般備註："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
--- 8498,8508 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
  msgid "Generation (copies):"
! msgstr "軟片版類別 (generation)："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr "混合"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
***************
*** 9227,9231 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
--- 9235,9239 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr "非安全軟片基底"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
***************
*** 11783,11787 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
--- 11791,11795 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr "不透明微縮片 (micro opaque)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
***************
*** 11793,11817 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
--- 11801,11825 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr "微縮單片 (microfiche)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr "卡式微縮單片 (microfiche cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr "盤式微縮捲片 (microform reel)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr "匣式微縮捲片 (microform cartridge)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr "卡式微縮捲片 (microform cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
***************
*** 12076,12082 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
- #, fuzzy
  msgid "Monochrome"
! msgstr "電話 (住宅)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
--- 12084,12089 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
  msgid "Monochrome"
! msgstr "單色 (monochrome)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
***************
*** 12368,12372 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
--- 12375,12379 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr "負片 (negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
***************
*** 13198,13202 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
--- 13205,13209 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr "正常縮率（16–30倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
***************
*** 13280,13284 ****
  "directory."
  msgstr "注意：罰款係由位於 misc 目錄內的 fines2.pl 計算。"
!  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
--- 13287,13291 ----
  "directory."
  msgstr "注意：罰款係由位於 misc 目錄內的 fines2.pl 計算。"
! 
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
***************
*** 14868,14872 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
--- 14875,14879 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr "含正負兩極 (mixed polarity)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
***************
*** 14923,14929 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
- #, fuzzy
  msgid "Polarite:"
! msgstr "印表機"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
--- 14930,14935 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
  msgid "Polarite:"
! msgstr "極性："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
***************
*** 15027,15033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
- #, fuzzy
  msgid "Positif"
! msgstr "職位"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
--- 15033,15038 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
  msgid "Positif"
! msgstr "正片 (positive)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
***************
*** 15121,15125 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
--- 15126,15130 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr "母片"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
***************
*** 15133,15137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15138,15142 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型 / 資料特殊類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15424,15433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
- #, fuzzy
  msgid "Rapport de reduction:"
! msgstr "複製品"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
--- 15429,15437 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr "閱讀放大倍率"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
  msgid "Rapport de reduction:"
! msgstr "縮率："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
***************
*** 15684,15696 ****
  msgstr ""
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
- msgid "Renseignement techniques sur la musique"
- msgstr "音樂作品之技術資料"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:505
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:507
--- 15688,15691 ----
***************
*** 15739,15747 ****
--- 15734,15748 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:490
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:576
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:662
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:748
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:834
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:920
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
  msgid "Renseignements techniques sur la musique"
  msgstr "音樂作品之技術資料"
***************
*** 16484,16488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
--- 16485,16489 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr "銀鹽 (silver halide)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
***************
*** 17461,17465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
--- 17462,17466 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr "軟片基底："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
***************
*** 17470,17474 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
--- 17471,17475 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr "安全軟片基底"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
***************
*** 18394,18400 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
- #, fuzzy
  msgid "Tirage"
! msgstr "欄"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
--- 18395,18400 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
  msgid "Tirage"
! msgstr "複製用母片 (printing master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
***************
*** 18743,18747 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
--- 18743,18747 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr "極高縮率（61–90 倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
***************
*** 19127,19131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr ""
  
  #  NOTE 譯文更動 by Arthur
--- 19127,19131 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr "超高縮率（91倍–）"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 19426,19430 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
--- 19426,19430 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr "重泡 (vesicular)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
***************
*** 20402,20406 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
  msgstr ""
--- 20402,20406 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, c-format
  msgid "for branch = %s"
  msgstr ""
***************
*** 20645,20664 ****
  msgstr "下限*"
  
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
- msgid "mandatory fields empty (see bold subfields)"
- msgstr "個必備欄位沒有填寫（見粗體的分欄）"
- 
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- msgid "mandatory tags empty"
- msgstr "個必備欄沒有填寫"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
  msgid "means : find biblio that have a"
--- 20645,20648 ----
***************
*** 21950,21953 ****
--- 21934,21940 ----
  #~ msgstr "關係*"
  
+ #~ msgid "Renseignement techniques sur la musique"
+ #~ msgstr "音樂作品之技術資料"
+ 
  #~ msgid "Rep"
  #~ msgstr "可重覆"




From acli at users.sourceforge.net  Mon Jan 24 09:12:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:12:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1,1.1.2.1
Message-ID: <E1CszL7-0002SI-Td@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Disambiguation for CMARC


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_116.tmpl	7 Jun 2004 09:50:40 -0000	1.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
***************
*** 219,223 ****
  
  	<tr>
! 		<td>Couleur</td>
  		<td>
  			<select name="f4" size="1">
--- 219,223 ----
  
  	<tr>
! 		<td>Couleur:</td>
  		<td>
  			<select name="f4" size="1">




From acli at users.sourceforge.net  Mon Jan 24 09:14:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:14:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CszNB-0002Zr-W5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9883

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:14:55 -0000	1.1.2.2
***************
*** 342,346 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 342,346 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 541,545 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 541,545 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 741,745 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 741,745 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->




From acli at users.sourceforge.net  Mon Jan 24 10:00:52 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:00:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.6,1.4.2.7
Message-ID: <E1Ct05c-0005HU-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20194

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly copied from CMARC


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
--- default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
***************
*** 2506,2509 ****
--- 2506,2510 ----
  msgstr "採購"
  
+ #  FIXME 台灣真是這樣叫嗎？好恐怖呀，「膠彩」好得多了……
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:438
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:440
***************
*** 2513,2517 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:839
  msgid "Acrylique"
[...1243 lines suppressed...]
  msgid "Tirage photographique"
! msgstr "照片 (photoprint)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:231
***************
*** 18584,18590 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
- #, fuzzy
  msgid "Toile"
! msgstr "題名"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016
--- 18542,18547 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
  msgid "Toile"
! msgstr "帆布"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016




From acli at users.sourceforge.net  Mon Jan 24 10:31:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:31:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.7,1.4.2.8
Message-ID: <E1Ct0ZC-0007GS-S5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27788

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -C2 -r1.4.2.7 -r1.4.2.8
*** default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
--- default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
***************
*** 7664,7670 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
- #, fuzzy
  msgid "Error 401"
! msgstr "錯誤：%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:5
--- 7664,7669 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
[...1547 lines suppressed...]
  msgid "Nocturnes"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:58
***************
*** 12792,12798 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
- #, fuzzy
  msgid "Non-applicable"
! msgstr "(如適用)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604
--- 12690,12695 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
  msgid "Non-applicable"
! msgstr "不適用"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604




From slef at users.sourceforge.net  Mon Jan 24 14:25:06 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:25:06 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88,1.88.2.1
Message-ID: <E1Ct4DK-0006S1-4Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24709

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
porting changes from 2.0.x

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -C2 -r1.88 -r1.88.2.1
*** Install.pm	5 Jan 2005 14:31:17 -0000	1.88
--- Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 27,33 ****
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
  require Exporter;
  
--- 27,34 ----
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! #use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
+ use File::Temp qw/ :mktemp /;
  require Exporter;
  
***************
*** 61,64 ****
--- 62,66 ----
  		&getmessage
  		&showmessage
+ 		&completeupgrade
  		&releasecandidatewarning
  		&getinstallationdirectories
***************
*** 86,90 ****
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
--- 88,92 ----
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser $httpdgroup );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
***************
*** 107,114 ****
  =cut
  
! my $termios = POSIX::Termios->new();
! $termios->getattr();
! my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n";
  
  sub heading ($) {
--- 109,116 ----
  =cut
  
! #my $termios = POSIX::Termios->new();
! #$termios->getattr();
! #my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
  
  sub heading ($) {
***************
*** 119,123 ****
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`;
  chomp($mytmpcnf);
  
--- 121,125 ----
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = mktemp("my.cnf.koha.XXXXXX");
  chomp($mytmpcnf);
  
***************
*** 127,138 ****
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: 
! * where most koha files should be stored (you can set the prefix environment variable for this);
! * the username and password of a mysql superuser; 
! * Details of your library setup. 
! * Details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for multiple Koha versions on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
--- 129,139 ----
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: where most koha files should be stored (you can set
! the prefix environment variable for this); the username and password of
! a mysql superuser; and details of your library setup.  You may also need
! to know details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for installing not as root, or to have many Kohas on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 150,154 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 262,269 ****
--- 263,274 ----
  $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq|
  Congratulations ... your Koha installation is complete!
+ 
  You will be able to connect to your Librarian interface at:
+ 
     http://%s\:%s/
+ 
     use the koha admin mysql login and password to connect to this interface.
  and the OPAC interface at:
+ 
     http://%s\:%s/
     
***************
*** 283,286 ****
--- 288,305 ----
  
  #'
+ 
+ =item completeupgrade
+ 
+    completeupgrade
+ 
+ Display a message describing what may need changing in httpd.conf
+ and any other instructions
+ 
+ =cut
+ 
+ sub completeupgrade {
+ 	showmessage(getmessage('UpgradeCompleted',[$intranetdir,$intranetdir,$intranetdir,$opacdir,$opacdir,$intranetdir]),'PressEnter');
+ }
+ 
  sub releasecandidatewarning {
      my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
***************
*** 290,294 ****
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements','');
  	print $message."\n";
  	exit;
--- 309,313 ----
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements');
  	print $message."\n";
  	exit;
***************
*** 375,378 ****
--- 394,398 ----
  Sets the sysconfdir, normally /etc.
  This should be an absolute path; a trailing / is not required.
+ Must be writeable, else we die.
  
  =cut
***************
*** 380,383 ****
--- 400,404 ----
  sub setetcdir ($) {
      ($etcdir) = @_;
+     if (! ((-d $etcdir) && (-w $etcdir))) { die("Cannot write to $etcdir! Please set the etcdir environment variable to a writeable directory.\nFailed"); }
  }
  
***************
*** 933,937 ****
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; } #"
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
--- 954,958 ----
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; }
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
***************
*** 1026,1030 ****
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") { #"
  	    $mysqldir=$mysql;
         }
--- 1047,1051 ----
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") {
  	    $mysqldir=$mysql;
         }
***************
*** 1303,1307 ****
--- 1324,1330 ----
  NOTE: You will need to add lines to your main httpd.conf to
  include %s/koha-httpd.conf
+ (using the Include directive)
  and to make sure it is listening on the right ports
+ and host names
  (using the Listen directive).
  
***************
*** 1463,1466 ****
--- 1486,1497 ----
  	print SITE <<EOP
  
+ # Koha 2.2 Apache Virtual Host Config File
+ #
+ # Please include this file in your apache configuration.
+ # The best way to do that depends on your site setup.
+ # Some like an Include adding to /etc/apache/httpd.conf
+ # and some prefer a symlink to this file from some dir.
+ # Please refer to your system manuals.
+ 
  # Ports to listen to for Koha
  # uncomment these if they aren't already in main httpd.conf
***************
*** 1469,1472 ****
--- 1500,1505 ----
  
  # NameVirtualHost is used by one of the optional configurations detailed below
+ # Please make sure this line is correct before uncommenting.
+ # See http://httpd.apache.org/docs/vhosts/ for some guides.
  
  #NameVirtualHost 11.22.33.44
***************
*** 1478,1481 ****
--- 1511,1515 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
+    Redirect permanent index.html http://$servername\:$opacport/cgi-bin/koha/opac-main.pl
     ErrorLog $logfiledir/opac-error_log
     TransferLog $logfiledir/opac-access_log
***************
*** 1491,1494 ****
--- 1525,1529 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ "$intranetdir/cgi-bin/"
+    Redirect permanent index.html http://$servername\:$intranetport/cgi-bin/koha/mainpage.pl
     ErrorLog $logfiledir/koha-error_log
     TransferLog $logfiledir/koha-access_log




From slef at users.sourceforge.net  Mon Jan 24 14:34:23 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:34:23 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.1,1.88.2.2
Message-ID: <E1Ct4MJ-00071J-0g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26955

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
database must be last parameter to bin/mysql in some version

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -C2 -r1.88.2.1 -r1.88.2.2
*** Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
--- Install.pm	24 Jan 2005 13:34:19 -0000	1.88.2.2
***************
*** 1806,1811 ****
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1806,1811 ----
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
! 	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
***************
*** 1951,1957 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='lp';
--- 1951,1957 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1972,1976 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  	}
  	my $language;
--- 1972,1976 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1982,1986 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1982,1986 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {




From slef at users.sourceforge.net  Mon Jan 24 20:37:58 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 11:37:58 -0800
Subject: [Koha-cvs] CVS: koha/misc/info INSTALL,NONE,1.1.2.1 ChangeLog,1.1,1.1.4.1 README,1.2,1.2.4.1
Message-ID: <E1CtA2A-000630-60@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/info
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23168

Modified Files:
      Tag: rel_2_2
	ChangeLog README 
Added Files:
      Tag: rel_2_2
	INSTALL 
Log Message:
Instructions and friends from 2.0

--- NEW FILE ---
Koha release 2.0.1 (stable series, first point release)
28 August 2004 MJR

Koha is distributed under the GNU GPL. Please read the file LICENSE for
more details.

To install the system please run: perl installer.pl

This will:
 1. Check for missing perl modules;
 2. Ask some questions and run some programs to collect system information;
 3. Write an apache httpd.conf file;
 4. Copy koha to the installation directory;
 5. Create a mysql database and load in basic data;
 6. Offer to try restarting apache;
 7. Invite you to fill in a survey from koha's developers.

perl 5.6.1 or higher is required.

The perl modules required are:
  DBI, Date::Manip, DBD::mysql, HTML::Template, Digest::MD5,
  MARC::Record, Mail::Sendmail, Event
Optionally, we can also use:
  Net::Z3950
You can install packages for these, or CPAN builds. The installer will
suggest CPAN builds, but it's your choice.

After installation, you need to make sure the generated koha-httpd.conf
file is "Include"d into your apache configuration and restart apache.
You may also need to configure daemons, depending on your installation.

A common need is to add the fines2.pl script to crontab. You will need
to put perl -I/path/to/koha/intranet/modules /path/to/fines2.pl, so
that it can find the koha modules.

If you wish to install without being root, please set the "etcdir" and
"prefix" environment variables before running the installer. etcdir
will be the configuration directory and prefix will be the installation
root directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** ChangeLog	22 Nov 2002 09:09:35 -0000	1.1
--- ChangeLog	24 Jan 2005 19:37:39 -0000	1.1.4.1
***************
*** 1,2 ****
--- 1,181 ----
+ 2004-11-17 13:03:42 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.2
+ 
+     Summary:
+       2.0.2 release update
+ 
+     README: updated version number, noted mod_perl unsafe
+     
+     modified files:
+      README
+ 
+ 
+ 2004-11-05 12:02:53 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1-patch-9
+ 
+     Summary:
+       Bugfixes
+ 
+     modules/C4/Maintenance.pm
+       Removed superfluous quote() calls after Chris spotted it in 2.1
+       Might fix some catmaint.pl problems.
+     
+     koha.version
+       2.0.2
+     
+     modified files:
+      koha.version modules/C4/Maintainance.pm
+ 
+ 
+ 2004-10-29 19:52:14 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1
+ 
+     Summary:
+       small bugfixes
+     Revision:
+ 
+     C4::Biblio bugfix from Paul Poulain:
+       drop empty fields, but NOT fields containing 0
+     
+     Remove spanish language option:
+       will be readded when translators answer email
+     
+     README:
+       add comment about fines2.pl
+     
+     Fix for bug 789:
+       shedges: patch -F 3 modules/C4/Search.pm BorrSearchPatch.txt
+ 
+     modified files:
+      INSTALL Install.pm modules/C4/Biblio.pm modules/C4/Search.pm
+ 
+ 
+ 2004-08-27 23:37:02 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-7
+ 
+     Summary:
+       Add release docs
+ 
+     2.0.1 release documentation
+     
+ 
+     new files:
+      INSTALL
+ 
+     modified files:
+      README
+ 
+ 
+ 2004-08-24 18:33:51 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-6
+ 
+     Summary:
+       Fix bug 816
+ 
+     Fixes bugs.koha.org 816 - use httpd config instead of meta redirect
+ 
+     modified files:
+      Install.pm
+ 
+ 
+ 2004-07-28 23:19:07 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-5
+ 
+     Summary:
+       Add kohaRHinstall
+ 
+     Slightly modified version of this, with Stephen's blessing. Probably
+     needs updating before release, if possible.
+     
+ 
+     new files:
+      docs/KohaRHinstall.html
+ 
+ 
+ 2004-07-28 23:18:06 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-4
+ 
+     Summary:
+       Bugfixes (esp. statistics/reports) and documentation
+ 
+     Complete bug 791 limit fix in C4::Authorities and C4::Maintainance, thanks to Kris Boutilier
+     
+     Check etcdir can be written to, in setetcdir.
+     
+     Added docs/installing_koha_on_debian.html from Joshua (GPL)
+     
+     Added optional parameter to C4::Stats::unfilledreserves to only select today's reserves
+     
+     Used unused parameter $time in intranet-cgi/reservereport.pl to only select today's reserves
+     
+     Updated reports/reports-home.tmpl
+     
+     Added reports/activity.tmpl
+     
+     Added missing function C4::Stats:statsreport
+     
+     Added intranet-cgi/reports/activity.pl
+ 
+     new files:
+      docs/installing_koha_on_debian.html docs/sources.txt
+      intranet-cgi/reports/activity.pl
+      intranet-html/intranet-tmpl/default/en/reports/activity.tmpl
+ 
+     modified files:
+      Install.pm intranet-cgi/reservereport.pl
+      intranet-html/intranet-tmpl/default/en/reports/reports-home.tmpl
+      modules/C4/Authorities.pm modules/C4/Circulation/Fines.pm
+      modules/C4/Maintainance.pm modules/C4/Stats.pm
+      opac-cgi/opac-new.pl
+ 
+ 
+ 2004-06-30 15:36:28 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-3
+ 
+     Summary:
+       Brown paper bag upgrade/Install fixes
+ 
+     Removed $etcdir from koha.upgrade (no longer needed)
+     
+     Added typo-removed $ to Install.pm
+     
+     modified files:
+      Install.pm koha.upgrade
+ 
+ 
+ 2004-06-30 15:13:48 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-2
+ 
+     Summary:
+       Bugfixes
+ 
+     Fix perldoc C4::Search
+     
+     Fix search parameter display bug 196
+     
+     Half-fix thesaurus word search bug 791 - thanks to M. Parienti
+     
+     Fix member.pl search bug 789
+     
+     removed files:
+      scripts/misc/my.cnf.koha.jsqrGh
+ 
+     modified files:
+      intranet-cgi/admin/thesaurus.pl modules/C4/Search.pm
+      opac-html/opac-tmpl/css/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/de/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/pl/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
+      opac-html/opac-tmpl/vanilla/en/opac-searchresults.tmpl
+ 
+ 
+ 2004-06-30 12:15:25 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-1
+ 
+     Summary:
+       Installation bugfixes
+ 
+     Fix mysql command syntax in Install.pm (database must be after -e in some v3)
+     
+     Removed FIXMEs from upgradecomplete by moving message inside Install.pm
+     
+     Fixed koha.upgrade mysql password handling
+     
+     Removed duplicate restoremycnf() calls from Install.pm - this is installer.pl's concern
+ 
+ 
  2002-10-30  Andrew Arensburger  <arensb at baa.ooblick.com>
  

Index: README
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/README,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** README	20 Jan 2003 03:40:03 -0000	1.2
--- README	24 Jan 2005 19:37:50 -0000	1.2.4.1
***************
*** 1,7 ****
! 19/7/00 chris at katipo.co.nz
  
! Koha is distributed under the GPL license, please read the file LICENSE for
  more details.
  
! To install the system please run installer.pl
  
--- 1,16 ----
! Koha release 2.0.2 (2.0 stable series, second point release)
! 17 November 2004 MJR
  
! Koha is distributed under the GNU GPL. Please read the file LICENSE for
  more details.
  
! To install the system, please see the INSTALL file.
! 
! To upgrade an existing system, please run: perl koha.upgrade
! 
! Please report any bugs to the koha mailing lists or bug tracker and we
! will try to fix them in a future release if possible. The main koha web
! site is http://www.koha.org/
! 
! Running under mod_perl is not advised for this version.
  




From oleonard at users.sourceforge.net  Mon Jan 24 21:42:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 12:42:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.1,1.6.2.2
Message-ID: <E1CtB2S-0001oL-25@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6814/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Formatting subscription start date in get_subscription_list_from_biblionumber according to system preference

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
--- Bull.pm	24 Jan 2005 20:41:47 -0000	1.6.2.2
***************
*** 177,180 ****
--- 177,181 ----
  	my @res;
  	while (my $subs = $sth->fetchrow_hashref) {
+ 		$subs->{'startdate'} = format_date($subs->{'startdate'});
  		push @res,$subs;
  	}




From oleonard at users.sourceforge.net  Mon Jan 24 22:59:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 13:59:57 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CtCFZ-0005y9-Ao@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22780/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding biblionumber to output variables so that link back to biblio works.

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
--- opac-serial-issues.pl	24 Jan 2005 21:59:12 -0000	1.1.2.2
***************
*** 33,36 ****
--- 33,37 ----
  
  $template->param(
+ 	biblionumber => $query->param('biblionumber'),
  	subscription_LOOP => $subscriptions
  # 	startdate => format_date($subscription->{startdate}),




From oleonard at users.sourceforge.net  Mon Jan 24 23:08:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:08:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.1,1.15.2.2
Message-ID: <E1CtCNM-0006Nq-Um@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
--- opac-detail.tmpl	24 Jan 2005 22:07:11 -0000	1.15.2.2
***************
*** 47,51 ****
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 47,51 ----
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:12:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:12:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.16
Message-ID: <E1CtCRW-0006bq-4N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25326/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	24 Jan 2005 22:11:54 -0000	1.16
***************
*** 46,51 ****
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 46,51 ----
  		<tr>
  			<td>
! <!-- TMPL_IF name="subtitle" --><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:52:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:52:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-serial-issues.tmpl,NONE,1.1 opac-ISBDdetail.tmpl,1.1,1.2 opac-MARCdetail.tmpl,1.1,1.2 opac-detail.tmpl,1.1,1.2
Message-ID: <E1CtD4U-0000mf-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2852/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-ISBDdetail.tmpl opac-MARCdetail.tmpl opac-detail.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl opac-serial-issues.tmpl 
Log Message:
Synching with default tempalte, other cosmetic changes

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Subscription Details
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->

<div id="main">

<h1>Subscription Details</h1>
<div class="table details">
<!-- TMPL_LOOP name="subscription_LOOP" -->
	<table>
	<caption><em><!-- TMPL_VAR name="bibliotitle" --></em></caption>
	<tr><th>Details:</th><td><p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every <b> <!--TMPL_IF name="periodicity1" --> day <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity2" --> week <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity3" --> 2 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity4" --> 3 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity5" --> month <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity6" --> 2 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity7" --> 3 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity8" --> quarter <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity9" --> 2 quarters <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity10" --> year <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity11" --> 2 years <!-- /TMPL_IF --> </b> on <b> <!--TMPL_IF name="arrival1" --> 	Monday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival2" --> Tuesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival3" --> Wednesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival4" --> Thursday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival5" --> Friday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival6" --> Saturday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival7" --> Sunday <!-- /TMPL_IF --> </b> for <b> 	<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF --> 	<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF --> 	<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF --> 	</b> since <b><!-- TMPL_VAR name="startdate" --></b> </p></td></tr>
<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR name="notes" --></td></tr><!-- /TMPL_IF -->
<!-- TMPL_IF name="opacnotes" --><tr><th>Issues summary</th><td><!-- TMPL_VAR name="opacnote" --></td></tr><!-- /TMPL_IF -->
	</table><!-- /TMPL_LOOP -->
</div>
<form action="/cgi-bin/koha/opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><p><input type="submit" class="submit" value="Back to Normal View" /></p></form>

</div>
</body>
</html>



Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	24 Jan 2005 22:51:51 -0000	1.2
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-MARCdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-MARCdetail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 6,22 ****
  <div id="main">
  <h2>MARC View</h2>
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="brief" value="Normal View" /></form>
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
! <form class="inline"><input type="submit" class="cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
--- 6,22 ----
  <div id="main">
  <h2>MARC View</h2>
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" /></form>
  
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
***************
*** 120,124 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	
  		<table>
  		<caption>Copies</caption>
--- 120,124 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! <!-- TMPL_IF NAME="item_header_loop" -->
  		<table>
  		<caption>Copies</caption>
***************
*** 135,139 ****
--- 135,143 ----
  					</tr>
  				<!-- /TMPL_LOOP -->
+ 		</table><!-- TMPL_ELSE -->
+ 		<table>
+ 			<tr><td>No copies available.</td></tr>
  		</table>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 35,43 ****
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
--- 35,41 ----
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
***************
*** 72,86 ****
  	</table>
  
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
! <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
--- 70,87 ----
  	</table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
  
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
***************
*** 112,115 ****
--- 113,119 ----
  <table><tr><td>No copies available.</td></tr></table>
  <!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="subscriptionsnumber" -->
+ 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>




From oleonard at users.sourceforge.net  Mon Jan 24 23:54:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:54:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.2
Message-ID: <E1CtD63-0000sU-HT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3261/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding styles for more input buttons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	24 Jan 2005 22:54:02 -0000	1.2
***************
*** 518,521 ****
--- 518,533 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Mon Jan 24 23:55:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:55:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images addtoshelf.gif,NONE,1.1 isbd.gif,NONE,1.1 placereserve.gif,NONE,1.1 addtobasket.gif,1.1,1.2 basket.gif,1.1,1.2 clearbasket.gif,1.1,1.2
Message-ID: <E1CtD7R-0000wi-Ij@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3485/koha-tmpl/opac-tmpl/npl/en/images

Modified Files:
	addtobasket.gif basket.gif clearbasket.gif 
Added Files:
	addtoshelf.gif isbd.gif placereserve.gif 
Log Message:
Adding and updating input button images

--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
Index: addtobasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/addtobasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsVA8MFf and /tmp/cvsuQkGMD differ

Index: basket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/basket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsYU6vAC and /tmp/cvsuauCKd differ

Index: clearbasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/clearbasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvs4fJPY7 and /tmp/cvsOQuiCM differ




From acli at users.sourceforge.net  Tue Jan 25 04:47:04 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 19:47:04 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.8,1.4.2.9
Message-ID: <E1CtHfU-0006eQ-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25498

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -r1.4.2.8 -r1.4.2.9
*** default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
--- default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
***************
*** 25,29 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
--- 25,29 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
[...1111 lines suppressed...]
- #, fuzzy
  msgid "Overdue charges"
! msgstr "過期圖書資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
--- 13865,13870 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:14
  msgid "Overdue charges"
! msgstr "過期罰款"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
***************
*** 13956,13960 ****
  #  NOTE 字義係由Simon Blake在#koha提供
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:37
- #, fuzzy
  msgid "P&amp;P"
  msgstr "運費"
--- 13895,13898 ----




From acli at users.sourceforge.net  Tue Jan 25 05:54:36 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:54:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_100.tmpl,1.3,1.3.2.1
Message-ID: <E1CtIiq-0001lo-E4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6781

Modified Files:
      Tag: rel_2_2
	unimarc_field_100.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** unimarc_field_100.tmpl	7 Jun 2004 09:46:36 -0000	1.3
--- unimarc_field_100.tmpl	25 Jan 2005 04:54:33 -0000	1.3.2.1
***************
*** 304,308 ****
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municiapal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->
--- 304,308 ----
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municipal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->




From acli at users.sourceforge.net  Tue Jan 25 05:57:34 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:57:34 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.9,1.4.2.10
Message-ID: <E1CtIli-0001w4-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7379

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly unimarc tag 100 related


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -r1.4.2.9 -r1.4.2.10
*** default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
--- default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
***************
*** 2971,2977 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
- #, fuzzy
  msgid "Allegorie"
! msgstr "類別"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:58
--- 2971,2976 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
[...980 lines suppressed...]
  #. INPUT type=submit
--- 20732,20736 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:50
  msgid "reproduction"
! msgstr "重印本、影印本、影鈔本、翻印本"
  
  #. INPUT type=submit
***************
*** 20799,20803 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr ""
  
  #  NOTE「See」中文譯「見」，「See also」中文譯「參見」，請勿改動
--- 20783,20787 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr "學齡兒童，5-10 歲"
  
  #  NOTE「See」中文譯「見」，「See also」中文譯「參見」，請勿改動




From acli at users.sourceforge.net  Tue Jan 25 06:31:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 21:31:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.10,1.4.2.11
Message-ID: <E1CtJJ1-0003hO-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14192

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -C2 -r1.4.2.10 -r1.4.2.11
*** default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
--- default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
***************
*** 551,555 ****
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authorised_value
--- 551,555 ----
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr "%s 或同義字典：%s 或模組：%s"
  
  #. %1$s: TMPL_VAR name=authorised_value
***************
*** 814,818 ****
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authtypecode
--- 814,818 ----
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr "(定義由第 %s 號新書建議取得)"
  
  #. %1$s: TMPL_VAR name=authtypecode
***************
*** 1430,1433 ****
--- 1430,1435 ----
  "<a5> ISBD </a> <a6> Add to shelf </a> <a7> Print </a>"
  msgstr ""
+ "<a1> 修改書目 </a> <a2> 修改圖書資料 </a> <a3> 移除 </a> <a4> 一般 </a> "
+ "<a5> ISBD </a> <a6> 新增至虛擬書架 </a> <a7> 列印 </a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:4
***************
*** 1439,1449 ****
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, fuzzy, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1>查看帳戶</a> <a2>繳交罰款</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
--- 1441,1451 ----
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr "<a1> 一般 </a> <a2> MARC </a> <a3> 新增至虛擬書架 </a> <a4> 列印 </a>"
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1> 列印 </a> <a2>%s 個書目</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
***************
*** 1460,1466 ****
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, fuzzy, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> %s (%s)"
  
  # FIXME Looks like a SCANNER BUG
--- 1462,1468 ----
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> (%s 個書目)"
  
  # FIXME Looks like a SCANNER BUG
***************
*** 1482,1486 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, fuzzy, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
--- 1484,1488 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
***************
*** 1488,1493 ****
  "<a9>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
! "a> <a7>設定</a> <a8>關於</a>"
  
  #  XXX 暫譯，譯文有待改進
--- 1490,1496 ----
  "<a9>Help</a>"
  msgstr ""
! "<a1>採購</a> <a2>目錄</a> <a3>流通</a> <a4>讀者</a> "
! "<a5>權威</a> <a6>報表</a> <a7>設定</a> <a8>關於</a> "
! "<a9>說明</a>"
  
  #  XXX 暫譯，譯文有待改進
***************
*** 1497,1500 ****
--- 1500,1504 ----
  msgstr "<a1>人手建立發票</a>　　<a2>人手記入讀者貸方</a>"
  
+ #  FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:32
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:41
***************
*** 1511,1515 ****
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
--- 1515,1519 ----
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr "<a1>書籍採購資金</a> <a2>容許值</a> <a3>貨幣</a> <a4>印表機</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
***************
*** 1519,1525 ****
  "<a5>Printers</a>"
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, fuzzy, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
--- 1523,1531 ----
  "<a5>Printers</a>"
  msgstr ""
+ "<a1>書籍採購資金</a> <a2>容許值</a> <a3>同義字典</a> <a4>貨幣</a> "
+ "<a5>印表機</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
***************
*** 1527,1537 ****
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
! "a> <a7>設定</a> <a8>關於</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, fuzzy, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>借出</a>　<a2>移交</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
--- 1533,1544 ----
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> "
! "<a5>流通</a> <a6>權威</a> <a7>報表</a> <a8>設定</a> "
! "<a9>有關</a> <a10>說明</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>借出</a>　<a2>還書</a>　<a3>移交</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
***************
*** 1556,1577 ****
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, fuzzy, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>%s</a> %s (%s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, fuzzy, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>下個讀者</a>　<a2>還書</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, fuzzy, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>下個讀者</a>　<a2>還書</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
--- 1563,1584 ----
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr "<a1>MARC</a> <a2>ISBD</a> <a3>新增至虛擬書架</a> <a4>列印</a>"
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>修改</a> %s%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>上一筆</a> <a2>下一筆</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>上一筆</a> <a2>下一筆</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
***************
*** 1589,1593 ****
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr ""
  
  #  NOTE 譯文更動 by Arthur
--- 1596,1600 ----
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr "<a1>搜尋</a> <a2>新增讀者</a> <a3>新增機構</a"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 1611,1619 ****
  msgstr "<a1>對帳表：</a>每日報告（昨天）"
  
! #  NOTE 譯文更動 by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, fuzzy, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>查看購物籃</a> <h1>%s - 訂單詳情</h1>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
--- 1618,1626 ----
  msgstr "<a1>對帳表：</a>每日報告（昨天）"
  
! #  FIXME please fix the scanner :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>查看購物籃</a> <h1 class=\"acquisition\">"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
***************
*** 1622,1641 ****
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, fuzzy, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>快速查詢</a> <a2>機讀格式查詢</a> <a3>虛擬書架</a> <a4>新增書目</a> <a5>"
! "目錄維護</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, fuzzy, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<a1>登錄</a>日期：%s"
  
  #  NOTE 譯文更動 by Arthur
--- 1629,1647 ----
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr "<a1>查詢</a> <a2>新增書目</a> <a3>期刊</a> <a4>虛擬書架</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>查詢</a> <a2>虛擬書架</a> <a3>新增書目</a> <a4>目錄維護</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<b><a1>登錄日期：</a></b>%s"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 1693,1699 ****
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
  
  #. For the first occurrence,
--- 1699,1705 ----
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>館別：</b>%s <b>印表機：</b>%s <a1>修改設定</a>"
  
  #. For the first occurrence,
***************
*** 1702,1715 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, fuzzy, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "已註銷：%s"
  
  #. For the first occurrence,
--- 1708,1721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>館別：</b>%s <i>印表機：</b>%s <a1>修改設定</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "<b>已註銷：</b>%s"
  
  #. For the first occurrence,
***************
*** 1759,1765 ****
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, fuzzy, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>日期：</b>%s"
  
  # XXX inconsistency?
--- 1765,1771 ----
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>應歸還日期：</b>%s"
  
  # XXX inconsistency?
***************
*** 1794,1797 ****
--- 1800,1804 ----
  "improved ldap support)"
  msgstr ""
+ "<b>EMN (Ecole des Mines de Nantes)</b>（新書建議、統計模組及改良後的 LDAP 支援）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:19
***************
*** 1803,1811 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=biblioitemnumber
--- 1810,1818 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr "<b>請輸入圖書資料之條碼：</b>圖書資料之條碼："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr "<b>Esiee 學院</b> (Jérome Vizcaino、Michel Lerenard、Pierre Cauchois)"
  
  #. %1$s: TMPL_VAR name=biblioitemnumber




From joshferraro at users.sourceforge.net  Tue Jan 25 17:53:31 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:53:31 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,NONE,1.1
Message-ID: <E1CtTwZ-0000bc-Cu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2165

Added Files:
	Amazon.pm 
Log Message:
The Amazon module allows libraries to deliver amazon content to the opac


--- NEW FILE ---

package C4::Amazon;
# Copyright 2004-2005 Joshua Ferraro (jmf at kados dot org)
#
# 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
#
# This module dynamically pulls amazon content into Koha.  It does not
# store the data in Koha's database.  You'll need to get a developer's key
# as well as an associate's tag to use it.
# FIXME: need to write up more docs.
#

use strict;
require Exporter;

use vars qw($VERSION @ISA @EXPORT);

$VERSION = 0.01;

@ISA = qw(Exporter);

@EXPORT = qw(
  &get_amazon_details
);

sub get_amazon_details {

my ( $isbn ) = @_;

# insert your dev key here
my $dev_key='';

# insert your associates tag here
my $af_tag='';

my $asin=$isbn;

# old way from command line: shift @ARGV or die "Usage:perl amazon_http.ol <asin>\n";

#my $url = "http://xml.amazon.com/onca/xml3?t=" . $af_tag .
#	"&dev-t=" . $dev_key .
#	"&type=heavy&f=xml&" .
#	"AsinSearch=" . $asin;
my $url = "http://xml.amazon.com/onca/xml3?t=$dev_key&dev-t=$af_tag&type=heavy&f=xml&AsinSearch=" . $asin;

#Here's an example asin for the book "Cryptonomicon"
#0596005423";

use XML::Simple;
use LWP::Simple;
my $content = get($url);
die "could not regrieve $url" unless $content;

my $xmlsimple = XML::Simple->new();
my $response = $xmlsimple->XMLin($content,
  forcearray => [ qw(Details Product AvgCustomerRating CustomerReview) ],
);
return $response;
#foreach my $result (@{$response->{Details}}){
#	my $product_description = $result->{ProductDescription};
#	my $image = $result->{ImageUrlMedium};
#	my $price = $result->{ListPrice};
#	my $reviews = $result->{
#	return $result;
#}
}




From joshferraro at users.sourceforge.net  Tue Jan 25 17:58:20 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:58:20 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.15
Message-ID: <E1CtU1E-0000zL-FC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3544

Modified Files:
	opac-detail.pl 
Log Message:
Adds amazon support to opac-detail.pl


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
***************
*** 10,14 ****
  use C4::Biblio;
  use C4::SearchMarc;
! 
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
--- 10,14 ----
  use C4::Biblio;
  use C4::SearchMarc;
! use C4::Amazon;
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
***************
*** 73,76 ****
  				subscriptionid => $subscriptionid,
  );
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 73,103 ----
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
! my $isbn=$dat->{'isbn'};
! my $amazon_details = &get_amazon_details($isbn);
! foreach my $result (@{$amazon_details->{Details}}){
!         $template->param(item_description => $result->{ProductDescription});
!         $template->param(image => $result->{ImageUrlMedium});
!         $template->param(list_price => $result->{ListPrice});
!         $template->param(amazon_url => $result->{url});
!                                 }
! 
! my @products;
! my @reviews;
! for my $details( @{ $amazon_details->{ Details } } ) {
!         next unless $details->{ SimilarProducts };
!         for my $product ( @{ $details->{ SimilarProducts }->{ Product } } ) {
!                 push @products, +{ Product => $product };
!         }
!         next unless $details->{ Reviews };
!         for my $product ( @{ $details->{ Reviews }->{ AvgCustomerRating } } ) {
!                 $template->param(rating => $product);
!         }
!         for my $reviews ( @{ $details->{ Reviews }->{ CustomerReview } } ) {
!                 push @reviews, +{ Summary => $reviews->{ Summary }, Comment => $reviews->{ Comment }, };
!         }
! }
! $template->param( SIMILAR_PRODUCTS => \@products );
! $template->param( REVIEWS => \@reviews );
!   ## End of Amazon Stuff
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:13:27 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:13:27 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.15,1.16
Message-ID: <E1CtUFr-0002ER-Mg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329

Modified Files:
	opac-detail.pl 
Log Message:
makes opac-detail.pl's amazon stuff just a comment


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
--- opac-detail.pl	25 Jan 2005 17:13:24 -0000	1.16
***************
*** 73,77 ****
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
--- 73,78 ----
  				subscriptionid => $subscriptionid,
  );
!   ## Amazon.com stuff
! =head
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
***************
*** 101,103 ****
--- 102,105 ----
  $template->param( REVIEWS => \@reviews );
    ## End of Amazon Stuff
+ =cut
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:23:35 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:23:35 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,1.1,1.2
Message-ID: <E1CtUPf-0002vh-TV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11210

Modified Files:
	Amazon.pm 
Log Message:
Added some minimal docs to Amazon.pm


Index: Amazon.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Amazon.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Amazon.pm	25 Jan 2005 16:53:28 -0000	1.1
--- Amazon.pm	25 Jan 2005 17:23:33 -0000	1.2
***************
*** 23,27 ****
  # FIXME: need to write up more docs.
  #
! 
  use strict;
  require Exporter;
--- 23,38 ----
  # FIXME: need to write up more docs.
  #
! # To use this module you need to do three things:
! # 1. get a dev key and associate tag from Amazon
! # 2. uncomment the Amazon stuff in opac-detail.pl
! # 3. add the template variables to opac-detail.tmpl
! #    here's what's available: 
! #    ProductDescription
! #    ImageUrlMedium
! #    ListPrice
! #    url
! #    loop SimilarProducts (Product)
! #    loop Reviews (rating, Summary)
! #
  use strict;
  require Exporter;




From oleonard at users.sourceforge.net  Tue Jan 25 22:29:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:29:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1.2.1 opac-detailprint.tmpl,NONE,1.1.2.1 opac-serial-issues.tmpl,NONE,1.1.2.1 opac-ISBDdetail.tmpl,1.1,1.1.2.1 opac-detail.tmpl,1.1,1.1.2.1 opac-search.tmpl,1.1,1.1.2.1 opac-searchresults.tmpl,1.1,1.1.2.1 opac-user.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtYFS-0001Rr-Fz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5141/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.tmpl opac-detail.tmpl opac-search.tmpl 
	opac-searchresults.tmpl opac-user.tmpl 
Added Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl opac-detailprint.tmpl 
	opac-serial-issues.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<html>
<body onLoad="window.print();self.close();">
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
	<table cellspacing="0" cellpadding="1" border="1" width=500>
	<tr valign="top">
		<td bgcolor="#cccc99" background="/images/background-mem.gif">
			<b>BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></b>
		</td>
	</tr>
	<tr valign="top">
		<td>
			<!-- TMPL_VAR NAME="author" --><br>
			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
			<!-- TMPL_VAR NAME="additional" --><br>
			<!-- TMPL_IF NAME="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
			<!-- TMPL_IF NAME="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
			</font>
		</td>
	</tr>
	</table>
<!-- /TMPL_LOOP -->

<table border="0" cellspacing="0" cellpadding="2">
	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
		<tr>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="branchname" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></td>
			<td><!-- TMPL_VAR NAME="barcode" --></td>
			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<script language="javascript" type="text/javascript">
function docprint() {
	window.print();
	window.close();
}
</script>
</body>
</html>
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<!--------------------------MAIN BODY OF PAGE-------------------------->
<div id="mainbloc">
<h1 class="catalogue">Issues for a subscription</h1>
<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
<form method="post" name="f">
<!-- TMPL_LOOP name="subscription_LOOP" -->
<div id="bloc60">
	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
		<b>
		<!--TMPL_IF name="periodicity1" -->
				day
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity2" -->
				week
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity3" -->
				2 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity4" -->
				3 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity5" -->
				month
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity6" -->
				2 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity7" -->
				3 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity8" -->
				quarter
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity9" -->
				2 quarters
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity10" -->
				year
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity11" -->
				2 years
		<!-- /TMPL_IF -->
		</b>
		on
		<b>
		<!--TMPL_IF name="arrival1" -->
			Monday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival2" -->
				Tuesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival3" -->
				Wednesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival4" -->
				Thursday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival5" -->
				Friday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival6" -->
				Saturday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival7" -->
				Sunday
		<!-- /TMPL_IF -->
		</b>
		for <b>
			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
			</b>
		since <b><!-- TMPl_VAR name="startdate" --></b>
		</p>
		<p><!-- TMPL_VAR name="notes" --></p>
	<!-- TMPL_IF name="opacnotes" -->
		<h2 class="catalogue">Issues summary</h2>
		<p>
			<!-- TMPL_VAR name="opacnote" -->
		</p>
	<!-- /TMPL_IF -->
</div>
<!-- /TMPL_LOOP -->
</div>

<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	25 Jan 2005 21:28:57 -0000	1.1.2.1
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
***************
*** 1,60 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
! </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
--- 1,90 ----
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
  	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
! </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
  		<tr>
+ 			<td>
+ 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
+ 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+ 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+ 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+ 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
+ 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
+ 					<!-- TMPL_LOOP name="subjects" -->
+ 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+ 					<br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+ 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+ 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+ 			</td>
+ 		</tr>
+ 	</table>
+ 
+ 
+ 	<!-- /TMPL_LOOP -->
+ 		<table>
+ 	<!-- TMPL_IF name="MARCNOTES" -->
+ 	<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
+ 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
***************
*** 62,118 ****
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
- 	</table>
- 
- <TMPL_UNLESS NAME="norequests">
-     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
-     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
-     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-     </form>
- </TMPL_UNLESS>
- <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
! 
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
! </div>
  </div>
! </body>
! </html>
! 
--- 92,143 ----
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
! 	<!-- /TMPL_IF -->
! 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-search.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-search.tmpl	25 Jan 2005 21:28:59 -0000	1.1.2.1
***************
*** 11,15 ****
  <div class="form">
  <table>
! <tr><th><label>Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
--- 11,15 ----
  <div class="form">
  <table>
! <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
***************
*** 17,53 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label>Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <!-- <tr><th><label class="label20">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Illustrator</label></th><td><input type="hidden" name="marclist" value="biblioitems.illus" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Dewey</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr> -->
! <tr><th><label class="label20">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label class="label20">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
--- 17,50 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="keyword" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="title">Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="subject">Subject</label></th><td>			
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" /></td></tr>
! <tr><th><label for="seriestitle">Series title</label></th><td>			
! 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="seriestitle" name="value" onchange="sql_update()" size="35"/></td></tr>
! 
! <tr><th><label for="itemtype">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
***************
*** 55,59 ****
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! 
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
--- 52,89 ----
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! <table>
! <caption>Other options:</caption>
! <tr><th><label for="barcode">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />
! 				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" /></td></tr>
! <tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="dewey" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="isbn">ISBN</label></th><td><input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="isbn" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="publisher">Publisher</label></th><td><input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="publisher" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="pubbetween">Published between</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value=">=" />
! 			<input type="text" id="pubbetween" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! <tr><th><label for="puband">...and</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="<=" />
! 			<input type="text" id="puband" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! </table>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 77,89 ****
  </form>
  
- <h3>Search by Subject</h3>
- <form action="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl" method="post">
- <div class="form">
- <table>
-  <tr><th><label for="subject">Subject</label></th><td><input type="text"  id="subject" size="25"   name="subject" /></td></tr>
- </table><input type="submit" value="Search" class="submit" />
- </div>
- </form>
- 
  <script type="text/javascript">
  function sql_update() {
--- 107,110 ----

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-searchresults.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-searchresults.tmpl	25 Jan 2005 21:29:00 -0000	1.1.2.1
***************
*** 86,95 ****
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL -->
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
! <!-- /Display for NPL -->
  </div> 
  
--- 86,95 ----
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL 
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
!  /Display for NPL -->
  </div> 
  
***************
*** 98,105 ****
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL -->	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div><!-- /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>
--- 98,105 ----
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL 	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div> /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
--- opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
***************
*** 128,132 ****
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 128,132 ----
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Tue Jan 25 22:39:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:39:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.3.2.1
Message-ID: <E1CtYP8-00024f-NN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7863/opac

Modified Files:
      Tag: rel_2_2
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:39:13 -0000	1.3.2.1
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:40:41 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.4
Message-ID: <E1CtYQT-0002An-G3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8316/opac

Modified Files:
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:40:38 -0000	1.4
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:52:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:52:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.1.2.1
Message-ID: <E1CtYc8-0002x7-Hv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11296/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:52:29 -0000	1.1.2.1
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 22:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.2
Message-ID: <E1CtYd4-00030J-No@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11505/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:53:33 -0000	1.2
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 23:42:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:42:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZOk-00063A-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23226/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-addbookbybiblionumber.tmpl	25 Jan 2005 21:29:02 -0000	1.1.2.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:42:53 -0000	1.1.2.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Tue Jan 25 23:45:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:45:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZQt-0006Am-0Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23647/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
--- opac-detail.tmpl	25 Jan 2005 22:45:05 -0000	1.1.2.2
***************
*** 1,143 ****
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
! 	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
! 		<tr>
! 			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
! 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
! 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
! 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
! 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
! 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
! 			</td>
! 		</tr>
! 	</table>
  
  
! 	<!-- /TMPL_LOOP -->
! 		<table>
! 	<!-- TMPL_IF name="MARCNOTES" -->
! 	<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
! 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
  	<!-- /TMPL_IF -->
- 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 1,109 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
+  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
+ <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
! 		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
+ </table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
  	<!-- /TMPL_IF -->
  </div>
! </div>
! </body>
! </html>
! 




From oleonard at users.sourceforge.net  Tue Jan 25 23:47:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:47:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.2,1.3
Message-ID: <E1CtZT3-0006JE-GR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24220/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Synching with default template, other cosmetic changes

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
--- opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
***************
*** 29,72 ****
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	</table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
--- 29,59 ----
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
! 
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! </table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
***************
*** 102,106 ****
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>
--- 89,93 ----
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>




From oleonard at users.sourceforge.net  Tue Jan 25 23:48:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:48:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.1.2.1
Message-ID: <E1CtZUT-0006NL-9R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24421/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;
***************
*** 518,521 ****
--- 527,542 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Tue Jan 25 23:49:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:49:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1.2.1,1.1.2.2
Message-ID: <E1CtZUx-0006Of-WD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding Dopop function for virtual shelves popup

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
--- script.js	25 Jan 2005 22:49:09 -0000	1.1.2.2
***************
*** 60,62 ****
  		return false;
  	}
! }
\ No newline at end of file
--- 60,66 ----
  		return false;
  	}
! }
! 
! function Dopop(link) {
! 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
! 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:53:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:53:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.2
Message-ID: <E1CtZZG-0006fN-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25604/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	script.js 
Log Message:
Three new functions: CheckAll, which toggles checkboxes in results lists; confirmDelete, which offers a warning before proceding with an action; Dopop, for popping up virtual shelves window

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	25 Jan 2005 22:53:46 -0000	1.2
***************
*** 39,40 ****
--- 39,66 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
+ 
+ function Dopop(link) {
+ 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:55:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:55:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.2,1.3
Message-ID: <E1CtZaX-0006lB-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25811/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac.css	24 Jan 2005 22:54:02 -0000	1.2
--- opac.css	25 Jan 2005 22:54:57 -0000	1.3
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;




From oleonard at users.sourceforge.net  Tue Jan 25 23:56:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:56:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CtZbx-0006qL-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-addbookbybiblionumber.tmpl	24 Jan 2005 22:51:52 -0000	1.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:56:27 -0000	1.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Wed Jan 26 17:39:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 26 Jan 2005 08:39:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17,1.17.2.1
Message-ID: <E1CtqCT-0003no-Me@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14532/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Minor corrections to syntax there and there.  Shouldn't affect display.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -r1.17 -r1.17.2.1
*** opac.css	3 Jan 2005 11:08:36 -0000	1.17
--- opac.css	26 Jan 2005 16:39:23 -0000	1.17.2.1
***************
*** 1,5 ****
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica;
  	font-size:12pt;
  	margin:0px;
--- 1,5 ----
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica,sans-serif;
  	font-size:12pt;
  	margin:0px;
***************
*** 276,281 ****
  #leftbloc {
  	float:left;
! 	width=30%;
! 	border:1;
  }
  
--- 276,281 ----
  #leftbloc {
  	float:left;
! 	width:30%;
! 	border:0;
  }
  
***************
*** 293,297 ****
  	float:left;
  	width:30%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 293,296 ----
***************
*** 301,305 ****
  	float:left;
  	width:60%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 300,303 ----
***************
*** 391,395 ****
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;
--- 389,393 ----
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:#FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;




From acli at users.sourceforge.net  Thu Jan 27 08:11:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 26 Jan 2005 23:11:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.11,1.4.2.12
Message-ID: <E1Cu3ob-0005vh-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22754

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -C2 -r1.4.2.11 -r1.4.2.12
*** default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
--- default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
***************
*** 59,64 ****
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:9
  msgid ""
--- 59,65 ----
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr "讀者類別「A」（成人）及「W」可以作為其他讀者的「擔保人」，如果該等讀者為他們的受養人。"
[...1075 lines suppressed...]
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "對應的分欄必須設定容許值為branches"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
- #, fuzzy
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "對應的分欄必須設定容許值為itemtype"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45
--- 20871,20880 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:81
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:95
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "對應的分欄必須設定容許值為「branches」"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "對應的分欄必須設定容許值為「itemtype」"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45




From oleonard at users.sourceforge.net  Thu Jan 27 18:18:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:18:31 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.2,1.3.2.3
Message-ID: <E1CuDHr-0008A6-Qw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
--- opac-shelves.pl	27 Jan 2005 17:18:28 -0000	1.3.2.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
! my $headerbackgroundcolor='#663266';
! my $circbackgroundcolor='#555555';
! my $circbackgroundcolor='#550000';
! my $linecolor1='#bbbbbb';
! my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,38 ----
  my $env;
  my $query = new CGI;
! 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
***************
*** 63,68 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
--- 59,63 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 				});
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.3.2.3  2005/01/27 17:18:28  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:27:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:27:15 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.4,1.5
Message-ID: <E1CuDQJ-0000At-DI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv648/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
--- opac-shelves.pl	27 Jan 2005 17:27:11 -0000	1.5
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
- my $headerbackgroundcolor='#663266';
- my $circbackgroundcolor='#555555';
- my $circbackgroundcolor='#550000';
- my $linecolor1='#bbbbbb';
- my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,37 ----
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.5  2005/01/27 17:27:11  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.4  2005/01/13 20:41:07  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:30:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:30:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.2.2.1
Message-ID: <E1CuDSz-0000L0-MS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1260/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:29:58 -0000	1.2.2.1
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 18:31:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:31:15 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.3
Message-ID: <E1CuDUB-0000Qa-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1633/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:31:13 -0000	1.3
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 19:10:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:10:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1.2.1,1.1.2.2
Message-ID: <E1CuE6I-0003Au-5W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12182/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
--- opac.css	27 Jan 2005 18:10:34 -0000	1.1.2.2
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:11:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:11:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.3,1.4
Message-ID: <E1CuE7G-0003Eu-I6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12411/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac.css	25 Jan 2005 22:54:57 -0000	1.3
--- opac.css	27 Jan 2005 18:11:36 -0000	1.4
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:18:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:18:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CuEDm-0003cb-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13906/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Adding icons to submit buttons

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
--- opac-shelves.tmpl	27 Jan 2005 18:18:19 -0000	1.1.2.2
***************
*** 5,9 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
--- 5,9 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
***************
*** 23,30 ****
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
--- 23,30 ----
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">




From oleonard at users.sourceforge.net  Thu Jan 27 19:21:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:21:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.2.2.1
Message-ID: <E1CuEGv-0003oO-A9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14633/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:21:28 -0000	1.2.2.1
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 19:23:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:23:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.3
Message-ID: <E1CuEIz-0003vB-Ug@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15056/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:23:43 -0000	1.3
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 20:31:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:31:16 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.7
Message-ID: <E1CuFMK-0008Ks-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32023

Modified Files:
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:31:14 -0000	1.7
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }




From oleonard at users.sourceforge.net  Thu Jan 27 20:35:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.7,1.8
Message-ID: <E1CuFQn-0000Ck-C7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv762/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
--- circulation.tmpl	27 Jan 2005 19:35:50 -0000	1.8
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 20:38:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:38:30 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.6.2.1
Message-ID: <E1CuFTK-0000Ow-UK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1485

Modified Files:
      Tag: rel_2_2
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:38:27 -0000	1.6.2.1
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jan 27 20:41:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:41:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.1,1.6.2.2
Message-ID: <E1CuFW8-0000dW-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2421/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
--- circulation.tmpl	27 Jan 2005 19:41:21 -0000	1.6.2.2
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 19:19:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:19:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-main.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1CuEEP-0003fS-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14052/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Taking out unused class name

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
--- opac-main.tmpl	27 Jan 2005 18:18:57 -0000	1.3.2.2
***************
*** 63,67 ****
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="opac-suggestions.pl" class="button">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>
--- 63,67 ----
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>




From oleonard at users.sourceforge.net  Thu Jan 27 23:24:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:24:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.33
Message-ID: <E1CuI3a-0002Z3-0L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9812/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:24:03 -0000	1.33
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,159 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
--- 164,168 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>




From oleonard at users.sourceforge.net  Thu Jan 27 23:25:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:25:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.32.2.1
Message-ID: <E1CuI54-0002er-Dw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10190/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
      Tag: rel_2_2
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:25:36 -0000	1.32.2.1
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,163 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->
--- 164,172 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div class="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->




From oleonard at users.sourceforge.net  Thu Jan 27 23:32:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:32:22 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.5.2.1
Message-ID: <E1CuIBa-00034P-HD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11780/members

Modified Files:
      Tag: rel_2_2
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:32:18 -0000	1.5.2.1
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Thu Jan 27 23:33:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:33:18 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.6
Message-ID: <E1CuICU-00037P-Eo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11975/members

Modified Files:
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:33:16 -0000	1.6
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Fri Jan 28 20:34:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 11:34:17 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.14.2.1
Message-ID: <E1Cubsn-00019E-V6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4384/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.  Copying this fix from HEAD to rel_2_2. Helps fix Bug 670

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	28 Jan 2005 19:34:15 -0000	1.14.2.1
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Fri Jan 28 21:13:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 12:13:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1CucVB-0003eg-Pf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14030/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.  Copied from HEAD.  Helps fix Bug 670

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
--- opac-user.tmpl	28 Jan 2005 20:13:54 -0000	1.1.2.3
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,89 ****
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
+ <!-- <th>Status</th> -->
  </tr>
  
***************
*** 91,99 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,111 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
+ <!-- <td>
+ <!-- TMPL_IF NAME="status" -->
+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
+ <!-- TMPL_ELSE -->
+ Not renewable
+ <!-- /TMPL_IF -->
+ </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 113,132 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 125,148 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From acli at users.sourceforge.net  Sun Jan 30 07:43:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 22:43:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Cv8ni-0007xA-6X@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30535

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Removed 1 fuzzy


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
--- css_opac_zh_TW.po	30 Jan 2005 06:43:11 -0000	1.4.2.5
***************
*** 18,27 ****
  "Content-Transfer-Encoding: 8bit\n"
  
- # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid " Biblio(s) added"
! msgstr "成功新增書目"
  
  #. %1$S: type=text name=value
--- 18,25 ----
  "Content-Transfer-Encoding: 8bit\n"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid " Biblio(s) added"
! msgstr "個書目成功新增"
  
  #. %1$S: type=text name=value




From acli at users.sourceforge.net  Sun Jan 30 08:07:10 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 23:07:10 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.12,1.4.2.13
Message-ID: <E1Cv9As-0000Wt-D0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1887

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor, partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -C2 -r1.4.2.12 -r1.4.2.13
*** default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
--- default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
***************
*** 2451,2455 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
--- 2451,2455 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr "接納"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
***************
*** 2461,2465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
--- 2461,2465 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr "接納者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
***************
*** 2474,2484 ****
  msgstr "<a1>%s %s</a> 之賬戶"
  
! #  NOTE Stephen Hedges 答：「Accounts」係指財務報表 (Till Reconciliation)
! #  NOTE 所以整個字串只需譯「報表」即可
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
- #, fuzzy
  msgid "Accounting details"
! msgstr "報表"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
--- 2474,2482 ----
  msgstr "<a1>%s %s</a> 之賬戶"
  
! #  NOTE 譯文更動 by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
  msgid "Accounting details"
! msgstr "會計詳情"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
***************
*** 2667,2673 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
- #, fuzzy
  msgid "Add a book by barcode"
! msgstr "在 %s 以條碼新增："
  
  #. %1$s: TMPL_VAR name=shelfname
--- 2665,2670 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
  msgid "Add a book by barcode"
! msgstr "以條碼新增圖書資料"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 3316,3322 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
- #, fuzzy
  msgid "Auth"
! msgstr "著者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
--- 3313,3318 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
  msgid "Auth"
! msgstr "權威"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
***************
*** 3443,3452 ****
  msgstr ""
  
! #  XXX 暫譯，要問人核對
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, fuzzy, c-format
  msgid "Authority number %s"
! msgstr "權威說明"
  
  #. For the first occurrence,
--- 3439,3448 ----
  msgstr ""
  
! # XXX
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, c-format
  msgid "Authority number %s"
! msgstr "權威號碼：%s"
  
  #. For the first occurrence,
***************
*** 3454,3488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, fuzzy, c-format
  msgid "Authority number : %s"
! msgstr "借書證號碼：%s"
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
- # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
- #, fuzzy
  msgid "Authority search"
! msgstr "權威"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
--- 3450,3486 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, c-format
  msgid "Authority number : %s"
! msgstr "權威號碼：%s"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
  msgid "Authority search"
! msgstr "權威搜尋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
***************
*** 3490,3503 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
- #, fuzzy
  msgid "Authority search results"
! msgstr "機讀格式查詢結果"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, fuzzy, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s 之機讀格式分欄結構管理"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
--- 3488,3500 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
  msgid "Authority search results"
! msgstr "權威搜尋結果"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s (%s) 之權威結構定義"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
***************
*** 4150,4173 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
- #, fuzzy
  msgid "Barcode Search"
! msgstr "館藏查詢"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
- #, fuzzy
  msgid "Barcode:"
! msgstr "條碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
--- 4147,4168 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
  msgid "Barcode Search"
! msgstr "條碼搜尋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
  msgid "Barcode:"
! msgstr "條碼："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
***************
*** 4581,4587 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
- #, fuzzy
  msgid "Book seller"
! msgstr "虛擬書架"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
--- 4576,4581 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
  msgid "Book seller"
! msgstr "圖書供應商"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
***************
*** 5240,5246 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
- #, fuzzy
  msgid "Category Code and Description"
! msgstr "類別管理"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
--- 5234,5239 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
  msgid "Category Code and Description"
! msgstr "類別代碼及描述"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
***************
*** 5615,5619 ****
  #. INPUT type=reset name=B2
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:174
- #, fuzzy
  msgid "Clear Fields"
  msgstr "全部重設"
--- 5608,5611 ----
***************
*** 10025,10034 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
- #, fuzzy
  msgid "Items requested"
! msgstr "已預約"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
--- 10017,10025 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr "借出的資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
  msgid "Items requested"
! msgstr "預約的資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
***************
*** 10065,10069 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "忽略"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
--- 10056,10060 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "象牙"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
***************
*** 17081,17085 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6
--- 17072,17076 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr "建議者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6




From acli at users.sourceforge.net  Mon Jan 31 02:52:39 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.2
Message-ID: <E1CvQk3-0006Zs-Ix@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25267

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:36 -0000	1.2
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:53:09 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:53:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CvQkX-0006ba-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25376

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:53:07 -0000	1.1.2.2
***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:52:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.1.2.1
Message-ID: <E1CvQkI-0006aV-Tz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25309

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 03:44:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 18:44:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.13,1.4.2.14
Message-ID: <E1CvRXm-0000n9-5z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2974

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -C2 -r1.4.2.13 -r1.4.2.14
*** default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
--- default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
***************
*** 227,230 ****
--- 227,231 ----
  msgstr "%S 年"
  
+ # XXX
  #. %1$p: type=radio name=label value=<!-- TMPL_VAR NAME="tagname" -->
  #. %2$s: TMPL_VAR name=labelname
***************
*** 232,236 ****
  #, c-format
  msgid "%p Label %s"
[...964 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
--- 18480,18484 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:25
  msgid "Tri-dimensionnel"
! msgstr "立體"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
***************
*** 20556,20560 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21
--- 20563,20567 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr "照像（例如以傳統可見光譜航空照像技術所製作之地圖）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21




From acli at users.sourceforge.net  Mon Jan 31 07:02:50 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 22:02:50 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.14,1.4.2.15
Message-ID: <E1CvUeA-0001u4-91@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7245

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.14
retrieving revision 1.4.2.15
diff -C2 -r1.4.2.14 -r1.4.2.15
*** default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
--- default_intranet_zh_TW.po	31 Jan 2005 06:02:44 -0000	1.4.2.15
***************
*** 610,614 ****
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s 個建議待理 <a1>管理</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
--- 610,614 ----
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s 個建議有待處理　<a1>處理</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
***************
*** 9810,9816 ****
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, fuzzy, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "在分館 <b>%s</b> 等候由 %s (<a1>%s</a>) 取書。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
--- 9810,9816 ----
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "圖書資料「%1$s」(%2$s) 現為「等候」狀態，正等候由 %4$s (<a1>%5$s</a>) 在 <b>%3$s</b> 取書。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
***************
*** 9925,9929 ****
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
--- 9925,9929 ----
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr "圖書資料類別：請在此處選擇圖書資料類別。如不選擇，將搜尋所有圖書資料類別。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
***************
*** 9939,9943 ****
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
--- 9939,9943 ----
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr "圖書資料類別有多種用途，而且對 Koha 的運作有<b>莫大</b>的影響："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
***************
*** 10338,10342 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "登入Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
--- 10338,10342 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "登入 Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
***************
*** 10394,10398 ****
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
--- 10394,10398 ----
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr "Koha 內部使用（你毋須修對以下的預設值作出任何修改）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
***************
*** 10410,10414 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
--- 10410,10414 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr "Koha 連結："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
***************
*** 10456,10468 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
--- 10456,10469 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr "標籤高度（公厘 / 毫米）"
  
+ # XXX
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr "起首列印之標籤號碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr "標籤闊度（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
***************
*** 10682,10686 ****
  #, c-format
  msgid "Link:%s,"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
--- 10683,10687 ----
  #, c-format
  msgid "Link:%s,"
! msgstr "連結：%s、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
***************
*** 10924,10927 ****
--- 10925,10929 ----
  "results screens."
  msgstr ""
+ "未被連結至 Koha 資料庫的機讀格式資料並不會消失&mdash;&mdash;它只是不會在流通畫面顯示，也不會在某些查詢館藏的結果列出。"
  
  #. %1$s: TMPL_VAR name=tagfield
***************
*** 11060,11068 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
- #, fuzzy
  msgid "Managed in tab"
! msgstr "在第「-1」格 (即不顯示)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
--- 11062,11071 ----
  msgstr ""
  
+ # FIXME bug in tokenizer
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
  msgid "Managed in tab"
! msgstr "在第幾格顯示："
  
+ # FIXME grammatical mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
***************
*** 11202,11210 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
--- 11205,11213 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr "頁面下面邊界（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr "頁面左面邊界（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
***************
*** 12390,12394 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
--- 12393,12397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr "沒有未處理的新書建議"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
***************
*** 15677,15683 ****
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, fuzzy, c-format
  msgid "Reserved by %s"
! msgstr "收貨人：%s"
  
  # XXX
--- 15680,15686 ----
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, c-format
  msgid "Reserved by %s"
! msgstr "圖書資料已被 %s 預約"
  
  # XXX
***************
*** 15685,15691 ****
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, fuzzy, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "%s 已預約 (<a1>%s</a>)。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
--- 15688,15694 ----
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "已預約：圖書資料已被 %s (<a1>%s</a>) 預約 。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
***************
*** 15914,15920 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
- #, fuzzy
  msgid "Sample"
! msgstr "姓"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
--- 15917,15922 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
  msgid "Sample"
! msgstr "樣本"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
***************
*** 16005,16013 ****
  msgstr "儲存"
  
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
- #, fuzzy
  msgid "Save Code"
! msgstr "條碼"
  
  #. INPUT type=submit
--- 16007,16015 ----
  msgstr "儲存"
  
+ #  NOTE「Code」此處係指「Country Code」
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
  msgid "Save Code"
! msgstr "儲存號碼"
  
  #. INPUT type=submit
***************
*** 16484,16496 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
--- 16486,16499 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr "設定頁面類型。"
  
+ # FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr "設定你使用的標籤的闊度及高度。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr "設定預設的 DPI 值。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
***************
*** 16498,16502 ****
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67
--- 16501,16505 ----
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr "設定圖書資料類別，乃安裝 Koha 後其中一個必須儘快辦妥的步驟。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67




From shedges at users.sourceforge.net  Sun Jan  2 15:12:42 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 02 Jan 2005 06:12:42 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,NONE,1.1
Message-ID: <E1Cl6TK-0003qX-KF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14771

Added Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Load original version

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Installing Koha 2.2 on Fedora Core (1, 2, 3)</title>

  <articleinfo>
    <pubdate>2005-01-03</pubdate>

    <author>
      <firstname>Joshua</firstname>

      <surname>Ferraro</surname>
    </author>

    <revhistory>
      <revision>
        <revnumber>2.2.0</revnumber>

        <date>2004-12-23</date>

        <revdescription>
          <para>Changes made by Joshua Ferraro. Original Document</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Using this document</title>

    <section>
      <title id="copyright">Copyright and License</title>

      <para>Copyright 2004, 2005 Joshua Ferraro <email>jmf (at)
      kados.org</email></para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).
      Koha-related documents may be reproduced and distributed in whole or in
      part, in any medium physical or electronic, as long as this copyright
      notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you: <orderedlist>
          <listitem>
            <para>License the derivative work with this same license, or the
            Linux Documentation Project License (<ulink
            url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
            Include a copyright notice and at least a pointer to the license
            used.</para>
          </listitem>

          <listitem>
            <para>Give due credit to previous authors and major
            contributors.</para>
          </listitem>
        </orderedlist></para>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>
    </section>

    <section>
      <title id="disclaimer">Disclaimer</title>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </section>
  </section>

  <section>
    <title>Introduction</title>

    <section>
      <title>Prior Knowledge and Assumptions</title>

      <para>In this document I assume that you are running a standard
      installation of <application>Fedora Core</application> (1, 2, or 3). If
      you need help setting up <application>Fedora Core</application> on your
      machine please see the Fedora installation manual available from <ulink
      url="http://fedora.redhat.com">http://fedora.redhat.com</ulink>. I would
      highly recommend using the latest release of <application>Fedora
      Core</application> as the shelf-life of these distributions is only
      about 12 months. If you need a longer shelf life for your
      <application>Koha</application> machines I recommend either
      <application>Red Hat Enterprise Linux</application> (AS or ES) or a
      distro like <application>Debian</application> which does not charge for
      a subscription service and has a much longer shelf life. If, like me,
      you expect that you will be upgrading your
      <application>Koha</application> installation every 6 months or so the
      <application>Fedora Core</application> series are a good choice.</para>

      <para>For more information about <application>Fedora Core</application>
      see the release notes for the distro you have chosen:</para>

      <variablelist>
        <varlistentry>
          <term>Core 1:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 2:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 3:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.htm</ulink>l</para>
          </listitem>
        </varlistentry>
      </variablelist>

      <para>If you already have some knowledge about
      <application>Linux</application> or other Unices it will be easier to
      understand this manual, however, no intermediate steps are necessary
      subsequent to the installation of <application>Fedora Core</application>
      before beginning the <application>Koha</application> installation. This
      guide is a "cookbook" for installing dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>.</para>
    </section>

    <section>
      <title>Internet Connection</title>

      <para>This guide assumes that the <application>Koha</application> server
      has a dedicated Internet connection -- a high-speed connection is best.
      It is possible to install <application>Koha</application> without a
      dedicated Internet connection, but this guide does not go into how to do
      that.</para>
    </section>

    <section>
      <title>Package Group Selections</title>

      <para>During a CD installation of <application>Fedora Core</application>
      you have the option of selecting "Package Groups" for installation --
      you can also access this utility after installation.<tip>
          <para>It can be found from the "hat" menu under <userinput>System
          Settings --&gt; Add/Remove Applications</userinput></para>
        </tip></para>

      <para>You'll want to install the following package groups:</para>

      <itemizedlist>
        <listitem>
          <para>Web Server</para>
        </listitem>

        <listitem>
          <para>MySQL Database<note>
              <para>Careful, Core 1 and 2 hide this option ... use the
              <userinput>Details</userinput> button to select
              <application>MySQL</application> and de-select
              <application>PostgreSQL</application></para>
            </note></para>
        </listitem>

        <listitem>
          <para>Development Tools</para>
        </listitem>

        <listitem>
          <para>Administration Tools (optional but a good idea)</para>
        </listitem>

        <listitem>
          <para>System Tools (optional but a good idea)</para>
        </listitem>
      </itemizedlist>

      <para>I don't generally recommend installing "Everything". Mainly this
      is because the more applications you have installed and running on your
      system the more complex the maintenance becomes. Running unused
      applications may also open up your system to attacks that would
      otherwise not be an issue.</para>
    </section>

    <section>
      <title>Firewall Configuration</title>

      <para>I would highly recommend utilizing the default firewall features
      that come with <application>Fedora Core</application>. However, you'll
      want to allow access to <command>http/https</command> (port 80 and 8080)
      as well as <command>ssh</command> (port 22). You can configure the
      firewall during the initial install or subsequently using the "Security
      Level" utility in the "hat" menu.</para>
    </section>

    <section>
      <title>A Note On The Graphical User Interface (GUI)</title>

      <para><application>Fedora Core</application> will always default to
      installing and loading your GUI (by default this is
      <application>X.org</application> and <application>Gnome</application>).
      In the past I have always disabled installation of the GUI on a
      production server, but lately I've taken to installing it and then
      tweaking the startup procedures so that the GUI does not load by default
      but must be started manually (so during normal operations the GUI does
      not waste precious resources). This is mainly because I find some of the
      GUI tools to be quite useful when I'm physically on-location and working
      on a server. To disable the GUI subsequent to installation simply edit
      <filename>/etc/inittab</filename> and make the default runlevel 3
      instead of 5. To start the GUI afterwards type
      <userinput>startx</userinput> at the command prompt.</para>

      <para>If the machine on which you will install
      <application>Koha</application> is nearby you can log in locally to
      perform the <application>Koha</application> install. But most folks find
      it more convenient to log in remotely using an <command>SSH</command> or
      a <command>Telnet</command> client. If you are running
      <application>Windows</application> you can start
      <command>Telnet</command> by clicking
      <userinput>Start-&gt;Run</userinput> from the start menu and typing
      <userinput>telnet</userinput>. Or you can download the free
      <command>SSH</command> program <command>PuTTy</command> from <ulink
      url="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html</ulink>.
      <command>SSH</command> is a more secure and robust terminal emulator
      standard and is a better choice.</para>

      <para>For many of the commands it will be necessary to have superuser
      privileges on the <application>Koha</application> server. However, it's
      generally not a good idea to log into your server directly as the root
      user. It's better to use the <command>su</command> utility to allow your
      regular user to obtain superuser privileges. For example,<literallayout>jmf at koha:~$ su
password:
koha:/home/jmf#</literallayout>The <prompt>#</prompt> tells you that you have
      root privileges. If you want to return to your regular user type
      <userinput>exit</userinput>.</para>
    </section>

    <section>
      <title>Update Your System</title>

      <para><application>Fedora Core</application> has a rapid development
      pace. There are usually daily updates or bugfixes to applications in the
      system. Be sure your installation is up-to-date. You can install updates
      either using the <command>up2date</command> application (or it's GUI
      equivalent) or by using the new tool <command>yum</command>. To install
      updates using <command>yum</command> type:<literallayout>[root at koha]# yum update</literallayout></para>

      <para>You can also use <command>yum</command> to install programs that
      have been packaged for <application>Fedora Core</application>. See the
      <command>yum</command> <command>man</command> page for more
      information.</para>
    </section>
  </section>

  <section>
    <title>Dependencies</title>

    <para><application>Koha</application> is built with a number of related
    open source web-based technologies which are sometimes designated with the
    acronym L.A.M.P. L.A.M.P. refers to <application>Linux</application> (the
    GNU/Linux operating system), <application>Apache</application> (a robust
    web server application), <application>MySQL</application> (a Relational
    Database Management System using the SQL standard) and Perl/Python/PHP
    (three common scripting languages). <application>Koha</application> was
    originally designed for a GNU/Linux system running
    <application>Apache</application> and <application>MySQL</application> and
    is written almost entirely in <application>Perl</application>. In order to
    install and use <application>Koha</application> it is necessary first to
    install and configure these dependencies.</para>

    <section>
      <title>Perl</title>

      <para>The majority of <application>Koha</application> is written in
      <application>Perl</application> -- a high-level programming or scripting
      language. <application>Perl</application>'s functionality and usefulness
      has been extended and enhanced through the development and free
      distribution of modules (programming libraries) within the
      <application>Perl</application> community. The vast majority of these
      modules are available through the Perl Network
      <emphasis>CPAN</emphasis>. Others are available for download from the
      module developer's website or <command>ftp</command> server. Some of
      these modules have also been packaged directly into <application>Fedora
      Core</application>'s packaging system.</para>

      <para><application>Koha</application> relies on several of these
      extended module libraries for its functions and getting all of these
      modules set up can be the most challenging part of the
      <application>Koha</application> installation.
      <application>Perl</application> itself is installed by default on a
      <application>Fedora Core</application> system so you needn't install it.
      The extended <application>Perl</application> modules that are not
      available via <application>Fedora Core</application>'s packaging system
      are available on the Perl Network <command>CPAN</command>.
      <application>Perl</application> has a utility that can be run to
      automatically install modules from <command>CPAN</command> and it's
      pretty good about keeping track of dependencies within
      <application>Perl</application> itself, but it cannot handle
      dependencies outside the <application>Perl</application> base. So before
      we can install these modules we need to install their dependencies which
      are outside of <application>Perl</application>.</para>

      <section>
        <title>Configuring Perl's CPAN utility while installing
        MARC::Record</title>

        <para>The first time you use <application>Perl</application>'s
        <command>CPAN</command> utility it will configure itself. So we can
        start that process by telling <application>Perl</application> to
        install the <filename>MARC::Record</filename> module from the
        <command>CPAN</command> network:<literallayout>koha:/# perl -MCPAN -e 'install "MARC::Record"'</literallayout>You
        should get the following message:<literallayout>/usr/share/perl/5.6.1/CPAN/Config.pm initialized.

CPAN is the world-wide archive of perl resources. It 
consists of about 100 sites that all replicate the same
contents all around the globe.  Many countries have at
least one CPAN site already. The resources found on CPAN
are easily accessible with the CPAN.pm module. If you want
to use CPAN.pm, you have to configure it properly.

If you do not want to enter a dialog now, you can answer
'no' to this question and I'll try to autoconfigure. (Note:
you can revisit this dialog anytime later by typing 'o conf
init' at the cpan prompt.)

Are you ready for manual configuration? [yes]</literallayout></para>

        <para>The setup process will take a while. It should be safe to answer
        all the questions with the default answers. You can safely ignore the
        utilities' attempts to get you to upgrade or install other
        <application>Perl</application> modules but you should allow it to
        prepend prerequisites. You can also set it to automatically build
        <application>Perl</application> prerequisites without asking by typing
        <userinput>follow</userinput> at the following prompt:<literallayout>The CPAN module can detect when a module that which you are
trying to build depends on prerequisites. If this happens,
it can build the prerequisites for you automatically
('follow'), ask you for confirmation ('ask'), or just
ignore them ('ignore'). Please set your policy to one of
the three values.

Policy on building prerequisites (follow, ask or ignore)? 
[ask]</literallayout>Eventually you may get the following
        message:<literallayout>Now we need to know where your favorite CPAN sites are located. Push
a few sites onto the array (just in case the first on the array won't
work). If you are mirroring CPAN to your local workstation, specify a
file: URL.

First, pick a nearby continent and country (you can pick several of
each, separated by spaces, or none if you just want to keep your
existing selections). Then, you will be presented with a list of URLs
of CPAN mirrors in the countries you selected, along with previously
selected URLs. Select some of those URLs, or just keep the old list.
Finally, you will be prompted for any extra URLs -- file:, ftp:, or
http: -- that host a CPAN mirror.

(1) Africa
(2) Asia
(3) Central America
(4) Europe
(5) North America
(6) Oceania
(7) South America
Select your continent (or several nearby continents) []</literallayout>Proceed
        by selecting the numeric value for your location. You may be prompted
        for a more specific location and finally you will be able to select
        several URLs for <command>CPAN</command> to use to download your
        modules from. It's a good idea to select a few just in case some of
        them are not operational or are slow.</para>
      </section>

      <section>
        <title>The Yaz Toolkit</title>

        <para>As long as everything went smoothly with the
        <command>CPAN</command> installation, <application>Perl</application>
        should finish the install and return you to the command prompt. We're
        almost ready to install the remaining <application>Perl</application>
        modules but one of them, namely <filename>Net::Z3950</filename>, has a
        non-Perl dependency that we need to install first called
        <application>Yaz</application>.</para>

        <para>As of this writing Indexdata, who wrote and maintains the
        <application>Yaz</application> toolkit has made packages available for
        <application>Fedora Core</application> 2 and 3. These can be
        downloaded from their <command>ftp</command> site: <ulink
        url="http://ftp.indexdata.dk/pub/yaz/redhat/">http://ftp.indexdata.dk/pub/yaz/redhat/</ulink>.
        You'll need the <filename>yaz</filename>, <filename>libyaz</filename>
        and <filename>libyaz-devel</filename> packages (the latest version
        should be fine and if you don't find a package for your specific
        version of <application>Fedora Core</application> a previous version
        should work). Navigate to a convenient spot and type:<literallayout>[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/yaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-devel-2.0.28-1.i386.rpm</literallayout></para>

        <para>Now you should have three rpms that can be installed with the
        <command>rpm</command> utility thusly:<literallayout>[root at koha]# rpm -i yaz*
[root at koha]# rpm -i libyaz*</literallayout>(the * is a wildcard).</para>
      </section>

      <section>
        <title>Installing the Remaining Perl Modules</title>

        <para>At this point we can install the other
        <application>Perl</application> modules:<literallayout>[root at koha]# perl -MCPAN -e 'install Event'
[root at koha]# perl -MCPAN -e 'install Net::Z3950'
[root at koha]# perl -MCPAN -e 'install Digest::MD5'
[root at koha]# perl -MCPAN -e 'install "HTML::Template"'
[root at koha]# perl -MCPAN -e 'install "Mail::Sendmail"'
[root at koha]# perl -MCPAN -e 'install "PDF::API2"'</literallayout></para>

        <para>That should take care of the <application>Perl</application>
        installation and configuration as well as all the modules. If we left
        any <application>Perl</application> modules out
        <application>Koha</application> will warn us when we run the install
        script and will give instructions on how to install them.</para>
      </section>
    </section>

    <section>
      <title>MySQL</title>

      <para>For a database <application>Koha</application> uses
      <application>MySQL</application> — a free SQL-query-based Relational
      Database Management System. The installation and basic configuration of
      <application>MySQL</application> on a Debian system is quite simple.
      More advanced topics such as database optimization and
      <application>MySQL</application> administration are documented online at
      <ulink
      url="http://www.mysql.com/doc/en/index.html">http://www.mysql.com/doc/en/index.html</ulink>.
      It would be well worth your while to familiarize yourself with the basic
      functionality and behaviour that you can expect from
      <application>MySQL</application>. Chapter 5, <citetitle>Database
      Administration</citetitle>, is especially relevant for using
      <application>Koha</application>.</para>

      <para>To install the <application>MySQL</application> server on your
      <application>Fedora Core</application> machine type:<literallayout>[root at koha]# yum install mysql-server</literallayout>After
      installing <application>MySQL</application> you will need to start it by
      typing:<literallayout>[root at koha]# /etc/init.d/mysqld start</literallayout></para>

      <para>Note that If <application>MySQL</application> fails to start you
      may need to adjust selinux. To do that type the
      following:<literallayout>[root at koha ~]# setenforce 0
[root at koha ~]# mysql_install_db
Preparing db table
Preparing host table
Preparing user table
Preparing func table
Preparing tables_priv table
Preparing columns_priv table
Installing all prepared tables
041201 17:07:25  /usr/libexec/mysqld: Shutdown Complete

To start mysqld at boot time you have to copy support-files/mysql.server
to the right place for your system

PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !
This is done with:
/usr/bin/mysqladmin -u root  password 'new-password'
/usr/bin/mysqladmin -u root -h koha.athenscounty.lib.oh.us  password 'new-password'
See the manual for more instructions.

You can start the MySQL daemon with:
cd /usr ; /usr/bin/safe_mysqld &amp;

You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:
cd sql-bench ; run-all-tests

Please report any problems with the /usr/bin/mysqlbug script!

The latest information about MySQL is available on the web at
http://www.mysql.com
Support MySQL by buying support/licenses at https://order.mysql.com

[root at koha ~]# setenforce 1</literallayout>Then start up
      <application>MySQL</application> again and you should be good to
      go.</para>

      <para>It's a good idea to set the <application>MySQL</application>
      administrator password right away. You will need to have this password
      handy later in the installation so make sure you write it down. You can
      set the password from the command line thusly:<literallayout>[root at koha]# mysqladmin password [type your new password here]</literallayout>but
      leave out the brackets.</para>
    </section>

    <section>
      <title>Apache</title>

      <para>According to the <application>Apache</application> website,
      <application>Apache</application> has been the most popular web server
      on the Internet since April of 1996. Additionally, the October 2003
      <citetitle>Netcraft Web Server Survey</citetitle> found that over 64% of
      websites on the Internet use <application>Apache</application>, making
      it more popular than all other web servers combined. You can see the
      survey at <ulink
      url="http://news.netcraft.com/">http://news.netcraft.com/</ulink>.
      Additionally, you can find out more about the Apache Software Foundation
      on their website at <ulink
      url="http://www.apache.org/">http://www.apache.org/</ulink>.</para>

      <para>We will have to configure <application>Apache</application> for
      <application>Koha</application> later on in the install, but for now you
      should know that <application>Apache</application>'s configuration files
      are kept in <filename>/etc/httpd/conf/httpd.conf</filename> and
      <application>Apache</application>'s log files are in
      <filename>/var/log/httpd</filename>.</para>
    </section>

    <section>
      <title>Conclusion</title>

      <para>Well, that's it, we've installed all the dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>. Now you are ready to download
      <application>Koha</application> from <ulink
      url="http://www.koha.org">http://www.koha.org</ulink> and install it
      following the directions in the <filename>INSTALL</filename>
      file.</para>
    </section>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jan  3 11:48:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:40 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.113,1.114 SearchMarc.pm,1.35,1.36
Message-ID: <E1ClPlQ-0005NA-8H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/C4

Modified Files:
	Biblio.pm SearchMarc.pm 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** Biblio.pm	10 Dec 2004 16:27:53 -0000	1.113
--- Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
***************
*** 254,258 ****
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
--- 254,258 ----
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
***************
*** 266,269 ****
--- 266,270 ----
      my $hidden;
      my $isurl;
+ 	my $link;
  
      while (
***************
*** 271,275 ****
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl )
          = $sth->fetchrow
        )
--- 272,276 ----
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl,			$link )
          = $sth->fetchrow
        )
***************
*** 286,289 ****
--- 287,291 ----
          $res->{$tag}->{$subfield}->{hidden}           = $hidden;
          $res->{$tag}->{$subfield}->{isurl}            = $isurl;
+         $res->{$tag}->{$subfield}->{link}            = $link;
      }
      return $res;
***************
*** 2633,2636 ****
--- 2635,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.114  2005/01/03 10:48:33  tipaul
+ # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
+ # * partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
+ #
  # Revision 1.113  2004/12/10 16:27:53  tipaul
  # limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items)

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** SearchMarc.pm	10 Dec 2004 16:27:53 -0000	1.35
--- SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
***************
*** 167,170 ****
--- 167,171 ----
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
+ 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 191,198 ****
  	
  	#last minute stripping out of ' and ,
! 	foreach $_ (@$value) {
! 	$_=~ s/\'/ /g;
! 	$_=~ s/\,/ /g;
! 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
--- 192,200 ----
  	
  	#last minute stripping out of ' and ,
! # paul : quoting, it's done a few lines lated.
! # 	foreach $_ (@$value) {
! # 		$_=~ s/\'/ /g;
! # 		$_=~ s/\,/ /g;
! # 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
***************
*** 202,206 ****
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
  		if(@$excluding[$i])	# NOT statements
  		{
--- 204,208 ----
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g if @$operator[$i] eq "contains";
  		if(@$excluding[$i])	# NOT statements
  		{




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.37,1.38
Message-ID: <E1ClPlV-0005Na-SU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** marc_subfields_structure.tmpl	4 Oct 2004 20:52:11 -0000	1.37
--- marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
***************
*** 137,140 ****
--- 137,141 ----
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
  	</td>




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.29,1.30
Message-ID: <E1ClPlV-0005NZ-Sn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** MARCdetail.tmpl	22 Dec 2004 10:14:43 -0000	1.29
--- MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
***************
*** 86,91 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 86,95 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 112,117 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 116,125 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 138,143 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 146,155 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 164,169 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 176,185 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 190,195 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 206,215 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 216,221 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 236,245 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 242,247 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 266,275 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 268,273 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 296,305 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 294,299 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 326,335 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 320,325 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 356,365 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.50,1.51
Message-ID: <E1ClPvE-0005nw-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/C4

Modified Files:
	Output.pm 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** Output.pm	5 Aug 2004 16:35:25 -0000	1.50
--- Output.pm	3 Jan 2005 10:58:46 -0000	1.51
***************
*** 74,78 ****
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
--- 74,78 ----
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 	my $opacstylesheet = C4::Context->preference('opacstylesheet');
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
***************
*** 83,86 ****
--- 83,87 ----
  							interface => ($opac ne 'intranet'? '/opac-tmpl': '/intranet-tmpl'),
  							theme => $theme,
+ 							opacstylesheet => $opacstylesheet,
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.7,1.8
Message-ID: <E1ClPvE-0005nx-L5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac-top.inc 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-top.inc	24 Nov 2004 16:08:55 -0000	1.7
--- opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
***************
*** 4,8 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 4,12 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
***************
*** 20,24 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 24,28 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Mon Jan  3 12:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:08:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.16,1.17 marc-editor.css,1.3,NONE
Message-ID: <E1ClQ4k-0006CP-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23824/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac.css 
Removed Files:
	marc-editor.css 
Log Message:
merging opac.css and marc-editor.css, that is used in MARC view.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac.css	15 Dec 2004 16:03:55 -0000	1.16
--- opac.css	3 Jan 2005 11:08:36 -0000	1.17
***************
*** 355,357 ****
  	padding-left:8pt;
  	float:left;
! }
\ No newline at end of file
--- 355,403 ----
  	padding-left:8pt;
  	float:left;
! }
! 
! /* for MARC view  */
! div.tabs {
! 	width:10px;
! 	position:absolute;
! 	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
! }
! 
! div.tabs a {
! 	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
! }
! 
! div.tab {
! 	background-color: #ACE6E6;
! 	display: block;
! 	visibility:hidden;
! 	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
! }
! td {
! 	border:0px;
! }
! 
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: thin solid #FF6600;
! 	margin-right:30%;
! }
! 
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
! }

--- marc-editor.css DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:36 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.2,1.3
Message-ID: <E1ClQ5g-0006Ev-Gn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/opac

Modified Files:
	opac-shelves.pl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.pl	12 Nov 2004 16:27:33 -0000	1.2
--- opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
--- 34,47 ----
  my $env;
  my $query = new CGI;
+ my $headerbackgroundcolor='#663266';
+ my $circbackgroundcolor='#555555';
+ my $circbackgroundcolor='#550000';
+ my $linecolor1='#bbbbbb';
+ my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
***************
*** 58,80 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					     LibraryName => C4::Context->preference("LibraryName"),
! 					});
  SWITCH: {
! 	if ($query->param('viewshelf')) {  viewshelf($query->param('viewshelf')); last SWITCH;}
! 	if ($query->param('shelves')) {  shelves(); last SWITCH;}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color=1;
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}= 1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
  ;
  		push (@shelvesloop, \%line);
--- 63,108 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
! 	if ($query->param('op') eq 'modifsave') {
! 		ModifShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
! 		last SWITCH;
! 	}
! 	if ($query->param('op') eq 'modif') {
! 		my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($query->param('shelf'));
! 		$template->param(edit => 1,
! 						shelfnumber => $shelfnumber,
! 						shelfname => $shelfname,
! 						"category$category" => 1);
! # 		editshelf($query->param('shelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('viewshelf')) {
! 		viewshelf($query->param('viewshelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('shelves')) {
! 		shelves();
! 		last SWITCH;
! 	}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color='';
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}= $color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
+ 		$line{"category".$shelflist->{$element}->{'category'}} = 1;
+ 		$line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq $loggedinuser;
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
+ 		$line{'firstname'}=$shelflist->{$element}->{'firstname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ 		$line{'surname'}=$shelflist->{$element}->{'surname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
  ;
  		push (@shelvesloop, \%line);
***************
*** 84,87 ****
--- 112,123 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
+ # sub editshelf {
+ # 	my ($shelfnumber) = @_;
+ # 	my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($shelfnumber);
+ # 	$template->param(edit => 1,
+ # 					shelfnumber => $shelfnumber,
+ # 					shelfname => $shelfname,
+ # 					"category$category" => 1);
+ # }
  sub shelves {
  	if (my $newshelf=$query->param('addshelf')) {
***************
*** 107,116 ****
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color=1;
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
--- 143,152 ----
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color='';
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
***************
*** 129,143 ****
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color=1;
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{'biblionumber'} = $item->{'biblionumber'};
  		push(@itemsloop, \%line);
  	}
--- 165,179 ----
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color='';
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
  	}
***************
*** 152,160 ****
  #
  # $Log$
! # Revision 1.2  2004/11/12 16:27:33  tipaul
! # fixes for printing a biblio
  #
! # Revision 1.1  2004/03/15 15:02:19  tipaul
! # adding virtual shelves to opac
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul
--- 188,209 ----
  #
  # $Log$
! # Revision 1.3  2005/01/03 11:09:34  tipaul
! # synch'ing virtual shelves management in opac with the librarian one, that has more features
! #
! # Revision 1.5  2004/12/16 11:30:57  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf name & status
! #
! # Revision 1.4  2004/12/15 17:28:23  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf (this being not finished, will commit the rest soon)
! #
! # Revision 1.3  2004/12/02 16:38:50  tipaul
! # improvement in book shelves
  #
! # Revision 1.2  2004/11/19 16:31:30  tipaul
! # bugfix for bookshelves not in official CVS
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-detail.tmpl,1.14,1.15 opac-ISBDdetail.tmpl,1.3,1.4 opac-main.tmpl,1.15,1.16 opac-MARCdetail.tmpl,1.4,1.5 opac-shelves.tmpl,1.1,1.2
Message-ID: <E1ClQ5h-0006F5-HJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl opac-ISBDdetail.tmpl opac-main.tmpl 
	opac-MARCdetail.tmpl opac-shelves.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.tmpl	22 Nov 2004 16:18:11 -0000	1.14
--- opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
***************
*** 3,11 ****
  
  <div id="bibliomenu">
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,17 ----
  
  <div id="bibliomenu">
+ 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+ 		Simple
+ 	</a>
+ 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
+ 		Complete
+ 	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-ISBDdetail.tmpl	28 Nov 2004 08:58:04 -0000	1.3
--- opac-ISBDdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.4
***************
*** 3,10 ****
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,16 ----
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
***************
*** 16,19 ****
--- 22,31 ----
  		</a>
  	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
+ 	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-main.tmpl	8 Dec 2004 10:26:32 -0000	1.15
--- opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
***************
*** 4,14 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
- 	<style type="text/css">
- 	input {
- 		background-color: #ACE6E6;
- 	}
- 	</style>
  </head>
  
--- 4,13 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
  

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-MARCdetail.tmpl	12 Nov 2004 16:28:10 -0000	1.4
--- opac-MARCdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.5
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
- <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_IF NAME="norequests" -->
! 	<!-- TMPL_ELSE -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
  	<!-- /TMPL_IF -->
  </div>
  
--- 1,30 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
+ 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+ 		Add to shelf
+ 	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
+ 	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
  	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-shelves.tmpl	15 Mar 2004 15:01:49 -0000	1.1
--- opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
***************
*** 2,160 ****
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
!     <table>
!     		<tr>
! 			<th colspan=4>
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
! 		</tr>
! 		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
! 					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="button">Shelf list</a>
! 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type=hidden name=modifyshelfcontents value=1>
! 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<!-- TMPL_IF name="manageshelf" -->
! 		<input type=submit value="Remove Selected Items" class="button">
  	<!-- /TMPL_IF -->
- </form>
- <!-- TMPL_IF name="manageshelf" -->
- <form>
- 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<input type=hidden name=modifyshelfcontents value=1>
- 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<table>
- 		<tr>
- 			<td>
- 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
- 			</td>
- 			<td>
- 				<input name="addbarcode">
- 				<input type=hidden name=modifyshelfcontents value=1>
- 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 				<input type="submit" value="Save" class="button">
- 			</td>
- 		</tr>
- 	</table>
- </form>
- <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<center>
! 		<h1>Bookshelves</h1>
! 		<table border=0 cellpadding=7>
! 			<tr>
! 				<td align=center valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="button">Shelf list</a>
! 						</p>
! 					</form>
! 				</td>
! 				<td align=center valign="bottom">
! 					<form method=post>
! 					<input type="hidden" name="shelves" value=1>
! 					<table border=0 cellpadding=0 cellspacing=0>
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
- 					</table>
  					<p>
! 						<input type=submit value="Delete Shelves" class="button"></form>
  					</p>
- 				</td>
- 				<td align=center valign=bottom>
- 					<form method=post>
- 					<input type=hidden name=shelves value=1>
- 					<table border=0 cellpadding=0 cellspacing=0>
- 						<tr>
- 							<th>
- 								<font color=white>Add Shelf</font>
- 							</th>
- 						</tr>
- 						<tr>
- 							<td>
- 								<p>Name : <input type="text" name="addshelf" size="25"></p>
- 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
- 								<p>Category : <select name="category">
- 									<option value="1">Private</option>
- 									<option value="2">Public</option>
- 									<option value="3">Free</option>
- 									</select>
- 								</p>
- 								<p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
- 									<li> A public can be seen by everybody, but managed only by you.</li>
- 									<li> A free can be managed by any user.</li>
- 								</p>
- 							</td>
- 						</tr>
- 					</table>
- 								<p><input type=submit value="Add New Shelf" class="button"></p>
  					</form>
! 				</td>
! 			</tr>
! 		</table>
  
  	<!-- TMPL_ELSE -->
! 		<center>
! 		<table border=0 cellpadding=4 cellspacing=0>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
--- 2,189 ----
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! 	<form>
! 		<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div>
! 		<h2>Shelf content</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th>delete</th>
! 					<th>barcode</th>
! 					<th>title</th>
! 					<th>Author</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Remove Selected Items" class="button">
! 			<!-- /TMPL_IF -->
! 			<a href="opac-shelves.pl" class="button">Shelf list</a>
! 		</div>
! 	</form>
! 
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
! 		<form>
! 		<h2>Add a book by barcode</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Save" class="button">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1>Bookshelves</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
! 					<h2>Select Shelves to Delete</h2>
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<p>
! 							<label>
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
! 							</label>
! 								<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
! 						</p>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					<p>
! 						<input type="submit" value="Delete Shelves" class="button">
  					</p>
  					</form>
! 		</div>
! 		<div id="bloc60">
! 			<form method="post">
! 				<input type="hidden" name="shelves" value="1">
! 				<h2>Add Shelf</h2>
! 				<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
! 				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
! 				<p><label>Category</label>
! 					<select name="category">
! 						<option value="1">Private</option>
! 						<option value="2">Public</option>
! 						<option value="3">Free</option>
! 					</select>
! 				</p>
! 				<ul> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 					<li> A public can be seen by everybody, but managed only by you.</li>
! 					<li> A free can be managed by any user.</li>
! 				</ul>
! 				<p>
! 					<input type="submit" value="Add New Shelf" class="button">
! 					<a href="opac-shelves.pl" class="button">back to shelf list</a>
! 				</p>
  
+ 			</form>
+ 		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
! 			<h2>Shelf list</h2>
! 			<table class="small">
! 				<tr>
! 					<th>Shelf name</th>
! 					<th>Category</th>
! 					<th>Content size</th>
! 					<th>Modify</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Private
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Public
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Free
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
! 							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc20">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2>Modify shelf</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Name</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Category</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Private</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Private</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Public</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Public</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Free</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Free</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
+ 				<li> A public can be seen by everybody, but managed only by you.</li>
+ 				<li> A free can be managed by any user.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Save" class="button">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jan  3 12:10:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:10:01 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,NONE,1.1
Message-ID: <E1ClQ65-0006GC-Kz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24046/opac

Added Files:
	opac-addbookbybiblionumber.pl 
Log Message:


--- NEW FILE ---
#!/usr/bin/perl
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
# $Header: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1 2005/01/03 11:09:59 tipaul 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::Search;
use C4::Biblio;
use CGI;
use C4::Output;
use C4::BookShelves;
use C4::Circulation::Circ2;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

my $env;
my $query = new CGI;
my $biblionumber = $query->param('biblionumber');
my $shelfnumber = $query->param('shelfnumber');
my $newbookshelf = $query->param('newbookshelf');
my $category = $query->param('category');

my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-addbookbybiblionumber.tmpl",
							query => $query,
							type => "opac",
							authnotrequired => 0,
						});

my $x; # for trash
($x,$x,$shelfnumber) = AddShelf('',$newbookshelf,$loggedinuser,$category) if $newbookshelf;

if ($shelfnumber) {
	&AddToShelfFromBiblio($env, $biblionumber, $shelfnumber);
	print "Content-Type: text/html\n\n<html><body onload=\"window.close()\"></body></html>";
	exit;
} else {

	my  ( $bibliocount, @biblios )  = getbiblio($biblionumber);

	my ($shelflist) = GetShelfList($loggedinuser,3);
	my @shelvesloop;
	my %shelvesloop;
	foreach my $element (sort keys %$shelflist) {
			push (@shelvesloop, $element);
			$shelvesloop{$element} = $shelflist->{$element}->{'shelfname'};
	}

	my $CGIbookshelves=CGI::scrolling_list( -name     => 'shelfnumber',
				-values   => \@shelvesloop,
				-labels   => \%shelvesloop,
				-size     => 1,
				-multiple => 0 );

	$template->param(biblionumber => $biblionumber,
						title => $biblios[0]->{'title'},
						author => $biblios[0]->{'author'},
						CGIbookshelves => $CGIbookshelves,
						);

	output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: opac-addbookbybiblionumber.pl,v $
# Revision 1.1  2005/01/03 11:09:59  tipaul
# *** empty log message ***
#

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Mon Jan  3 12:11:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:11:13 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.86,1.87
Message-ID: <E1ClQ7F-0006Ku-U3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24344/misc

Modified Files:
	Install.pm 
Log Message:
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** Install.pm	15 Dec 2004 14:39:21 -0000	1.86
--- Install.pm	3 Jan 2005 11:11:10 -0000	1.87
***************
*** 1772,1776 ****
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv,lock_tables_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1772,1776 ----
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login




From tipaul at users.sourceforge.net  Mon Jan  3 13:55:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:55:40 -0800
Subject: [Koha-cvs] CVS: koha/misc koha.mysql,1.9,1.10
Message-ID: <E1ClRkK-0002Uw-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9571/misc

Modified Files:
	koha.mysql 
Log Message:
adding an index

Index: koha.mysql
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.mysql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** koha.mysql	12 Nov 2004 16:39:48 -0000	1.9
--- koha.mysql	3 Jan 2005 12:55:22 -0000	1.10
***************
*** 925,929 ****
  # Structure de la table `marc_subfield_structure`
  #
- 
  CREATE TABLE marc_subfield_structure (
    tagfield char(3) NOT NULL default '',
--- 925,928 ----
***************
*** 945,949 ****
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------
--- 944,949 ----
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield),
!   KEY kohafield_2 (kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------




From tipaul at users.sourceforge.net  Mon Jan  3 13:56:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:56:32 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.31,1.32
Message-ID: <E1ClRlA-0002XZ-Op@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9753/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** marc_subfields_structure.pl	8 Dec 2004 10:41:38 -0000	1.31
--- marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
***************
*** 380,383 ****
--- 380,384 ----
  		$row_data{hidden}	= $results->[$i]{'hidden'};
  		$row_data{isurl}	= $results->[$i]{'isurl'};
+ 		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
  		$row_data{bgcolor} = $toggle;




From tipaul at users.sourceforge.net  Mon Jan  3 13:57:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:57:24 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.24,1.25
Message-ID: <E1ClRm0-0002Zh-8A@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9893

Modified Files:
	MARCdetail.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** MARCdetail.pl	22 Dec 2004 10:14:43 -0000	1.24
--- MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
***************
*** 74,78 ****
  
  my $record =MARCgetbiblio($dbh,$bibid);
- warn "=>".$record->as_formatted;
  # open template
  my ($template, $loggedinuser, $cookie)
--- 74,77 ----
***************
*** 96,100 ****
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
--- 95,99 ----
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! # 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
***************
*** 116,119 ****
--- 115,119 ----
  				my %subfield_data;
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
+ 				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";




From tipaul at users.sourceforge.net  Mon Jan  3 13:58:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:58:01 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools - New directory
Message-ID: <E1ClRmb-0002av-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933/misc/migration_tools

Log Message:
Directory /cvsroot/koha/koha/misc/migration_tools added to the repository





From tipaul at users.sourceforge.net  Mon Jan  3 13:59:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:59:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools buildLANG.pl,NONE,1.1
Message-ID: <E1ClRoN-0002fT-Ew@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10247/misc/migration_tools

Added Files:
	buildLANG.pl 
Log Message:
Auto-build LANG authorized values

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
# use MARC::File::USMARC;
# use MARC::Record;
# use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $fields, $number,$language) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$fields,
    'v' => \$verbose,
	'l:s' => \$language,
);

if ($version or !$fields) {
	print <<EOF
Small script to recreate the LANG list in authorised values from existing langs in the catalogue.
This script is useful when you migrate your datas with bulkmarcimport.pl as it populates parameters tables that are not modified by bulkmarcimport.

parameters :
\th : this version/help screen
\ts : the field or field list where the lang codes are stored.
\td : delete every entry of LANG category before doing work.
\tl : the language of the language list (fr or en for instance)

The table is populated with iso codes and meaning (in french).
If the complete language name is unknown, the code is used instead and you will be warned by the script

SAMPLES :
 ./buildLANG -d -s "('101a','101b')"
EOF
;#
exit;
}

my %codesiso;

%codesiso = (
	'eng' => 'english',
	'fre' => 'french'
	);

%codesiso = (
	'mis' => 'diverses',
	'und' => 'inconnue',
	'mul' => 'multilingue',
	'ger' => 'allemand',
	'eng' => 'anglais',
	'ara' => 'arabe',
	'arm' => 'arm�nien',
	'baq' => 'basque',
	'ber' => 'berbere',
	'bre' => 'breton',
	'bul' => 'bulgare',
	'cat' => 'catalan',
	'chi' => 'chinois',
	'cro' => 'croate',
	'dan' => 'danois',
	'spa' => 'espagnol',
	'esp' => 'esp�ranto',
	'fin' => 'finnois',
	'fra' => 'fran�ais ancien',
	'fre' => 'fran�ais',
	'wel' => 'gallois',
	'grc' => 'grec classique',
	'gre' => 'grec moderne',
	'heb' => 'h�breu',
	'hun' => 'hongrois',
	'ita' => 'italien',
	'jap' => 'japonais',
	'lat' => 'latin',
	'dut' => 'n�erlandais',
	'nor' => 'norv�gien',
	'pol' => 'polonais',
	'por' => 'portugais',
	'rum' => 'roumain',
	'rus' => 'russe',
	'ser' => 'serbe',
	'swe' => 'suedois',
	'cze' => 'tch�que',
	'tur' => 'turc',
	'ukr' => 'ukraine',
	'slo' => 'slov�ne',
	'scr' => 'serbo-croate',
	) if $language eq 'fr';

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting lang list\n";
	$dbh->do("delete from authorised_values where category='LANG'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
my $starttime = gettimeofday;

my $sth = $dbh->prepare("SELECT DISTINCT subfieldvalue FROM marc_subfield_table WHERE tag + subfieldcode IN $fields order by subfieldvalue");

$sth->execute;
my $i=1;

print "=========================\n";
my $sth2 = $dbh->prepare("insert into authorised_values (category, authorised_value, lib) values (?,?,?)");
while (my ($langue) = $sth->fetchrow) {
	$sth2->execute('LANG',$langue,$langue?$codesiso{$langue}:$langue);
	print "lang : $langue is unknown is iso list\n" unless $codesiso{$langue};
}
print "=========================\n";




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc bulkmarcimport.pl,1.9,NONE
Message-ID: <E1ClU5g-000225-P0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc

Removed Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- bulkmarcimport.pl DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools bulkmarcimport.pl,NONE,1.1
Message-ID: <E1ClU5g-000220-CS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc/migration_tools

Added Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- NEW FILE ---
#!/usr/bin/perl
# small script that import an iso2709 file into koha 2.0

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $delete, $test_parameter,$char_encoding, $verbose);
GetOptions(
    'file:s'    => \$input_marc_file,
    'n' => \$number,
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'c:s' => \$char_encoding,
    'v:s' => \$verbose,
);

if ($version || ($input_marc_file eq '')) {
	print <<EOF
small script to import an iso2709 file into Koha.
parameters :
\th : this version/help screen
\tfile /path/to/file/to/dump : the file to dump
\tv : verbose mode. 1 means "some infos", 2 means "MARC dumping"
\tn : the number of the record to import. If missing, all the file is imported
\tt : test mode : parses the file, saying what he would do, but doing nothing.
\tc : the char encoding. At the moment, only MARC21 and UNIMARC supported. MARC21 by default.
\d : delete EVERYTHING related to biblio in koha-DB before import  :tables :
\t\tbiblio, \t\tbiblioitems, \t\tsubjects,\titems
\t\tadditionalauthors, \tbibliosubtitles, \tmarc_biblio,
\t\tmarc_subfield_table, \tmarc_word, \t\tmarc_blob_subfield
IMPORTANT : don't use this script before you've entered and checked twice (or more) your  MARC parameters tables.
If you fail this, the import won't work correctly and you will get invalid datas.

SAMPLE : ./bulkmarcimport.pl -file /home/paul/koha.dev/local/npl -n 1
EOF
;#'
die;
}

my $dbh = C4::Context->dbh;

if ($delete) {
	print "deleting biblios\n";
	$dbh->do("delete from biblio");
	$dbh->do("delete from biblioitems");
	$dbh->do("delete from items");
	$dbh->do("delete from bibliosubject");
	$dbh->do("delete from additionalauthors");
	$dbh->do("delete from bibliosubtitle");
	$dbh->do("delete from marc_biblio");
	$dbh->do("delete from marc_subfield_table");
	$dbh->do("delete from marc_word");
	$dbh->do("delete from marc_blob_subfield");
}
if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}

$char_encoding = 'MARC21' unless ($char_encoding);
print "CHAR : $char_encoding\n" if $verbose;
my $starttime = gettimeofday;
my $batch = MARC::Batch->new( 'USMARC', $input_marc_file );
$batch->warnings_off();
$batch->strict_off();
my $i=0;
#1st of all, find item MARC tag.
my ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.itemnumber",'');
# $dbh->do("lock tables biblio write, biblioitems write, items write, marc_biblio write, marc_subfield_table write, marc_blob_subfield write, marc_word write, marc_subfield_structure write, stopwords write");
while ( my $record = $batch->next() ) {
	$i++;
	#now, parse the record, extract the item fields, and store them in somewhere else.

    ## create an empty record object to populate
    my $newRecord = MARC::Record->new();

    # go through each field in the existing record
    foreach my $oldField ( $record->fields() ) {

	# just reproduce tags < 010 in our new record
	if ( $oldField->tag() < 10 ) {
	    $newRecord->append_fields( $oldField );
	    next();
	}

	# store our new subfield data in this list
	my @newSubfields = ();

	# go through each subfield code/data pair
	foreach my $pair ( $oldField->subfields() ) { 
		$pair->[1] =~ s/\<//g;
		$pair->[1] =~ s/\>//g;
		push( @newSubfields, $pair->[0], char_decode($pair->[1],$char_encoding) );
	}

	# add the new field to our new record
	my $newField = MARC::Field->new(
	    $oldField->tag(),
	    $oldField->indicator(1),
	    $oldField->indicator(2),
	    @newSubfields
	);

	$newRecord->append_fields( $newField );

    }


	warn "$i ==>".$newRecord->as_formatted() if $verbose eq 2;
	my @fields = $newRecord->field($tagfield);
	my @items;
	my $nbitems=0;

	foreach my $field (@fields) {
		my $item = MARC::Record->new();
		$item->append_fields($field);
		push @items,$item;
		$newRecord->delete_field($field);
		$nbitems++;
	}
	print "$i : $nbitems items found\n" if $verbose;
	# now, create biblio and items with NEWnewXX call.
	unless ($test_parameter) {
		my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'');
		warn "ADDED biblio NB $bibid in DB\n" if $verbose;
		for (my $i=0;$i<=$#items;$i++) {
			NEWnewitem($dbh,$items[$i],$bibid);
		}
	}
}
# $dbh->do("unlock tables");
my $timeneeded = gettimeofday - $starttime;
print "$i MARC record done in $timeneeded seconds";




From tipaul at users.sourceforge.net  Mon Jan  3 17:12:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:12:31 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator default_intranet_pl_PL.po,1.13,NONE default_opac_pl_PL.po,1.9,NONE
Message-ID: <E1ClUop-0004nJ-Pg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18406

Removed Files:
	default_intranet_pl_PL.po default_opac_pl_PL.po 
Log Message:
removing .po in the wrong place (is in po/ now)

--- default_intranet_pl_PL.po DELETED ---

--- default_opac_pl_PL.po DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 17:30:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:30:16 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,NONE,1.1 translator_doc.txt,1.5,1.6
Message-ID: <E1ClV60-00062S-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23202

Modified Files:
	translator_doc.txt 
Added Files:
	rebuild_lang.sh 
Log Message:
updating doc & adding a script to rebuild officially supported languages

--- NEW FILE ---
#!/bin/sh
./tmpl_process3.pl install -r -s po/css_opac_fr_FR.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/fr
./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr

./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW

./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** translator_doc.txt	30 Dec 2004 06:58:19 -0000	1.5
--- translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
***************
*** 22,27 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,26 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 34,40 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /
!         home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 33,37 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 47,52 ****
   1. Update your translation file:
     
!         ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 44,48 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 54,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
--- 50,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
+  
+ REBUILD ALL
+ ===========
+ The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
+ Useful for developpers, probably useless for all end-users.
+ 
  
  WEAKNESSES
***************
*** 71,74 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 
--- 71,73 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan  4 21:21:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 12:21:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/barcodes barcodes.tmpl,1.3,1.4
Message-ID: <E1ClvAq-0002XW-SF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686/koha-tmpl/intranet-tmpl/default/en/barcodes

Modified Files:
	barcodes.tmpl 
Log Message:
Corrections to English and minor corrections to HTML

Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** barcodes.tmpl	19 Oct 2004 11:50:18 -0000	1.3
--- barcodes.tmpl	4 Jan 2005 20:20:52 -0000	1.4
***************
*** 1,186 ****
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div class="countryPanel" style="position:absolute" id="addCountryCode">

!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">

! 		<input type="hidden" name="addCode" value="1">

! 		<table style="background-color:#EFEFEF;border:1px" align="center">

! 			<tr>

! 				<th colspan="2">

! 					Add a new Country Code

! 				</th>

! 			</tr>

! 			<tr>

! 				<td>

! 					Country Name&nbsp<input type="text" size="10" id="countryName" name="countryName"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 				<td>

! 					Country Code&nbsp<input type="text" size="3" id="countryCode" name="countryCode"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 			</tr>

! 			<tr>

! 				<td align="right">

! 					<input type="submit" name="submit" id="submit" value="Save Code"/>

! 				</td>

! 				<td align="left">

! 					<input type="button" name="cancel" id="cancel" value="Cancel"

! 					       onclick="javascript: document.getElementById('addCountryCode').style.display = 'none'"/>

! 				</td>

! 			</tr>

! 		</table>

! 	</form>

! </div>

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div id="mainbloc">

! 	<h1>Barcodes Generator</h1>

! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

! 		<tr valign="center">

! 			<td><font size="4">Generate barcodes from inventary codes</font></td>

! 		</tr>

! 	</table>

! 	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>Select the standard type to generate barcodes.</li>

! 		<li>Define the page size for output the PDF.</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

! 		</li>

! 	</ul>

! 	<br>

! 	<form id="formulario" method="POST" action='<!-- TMPL_VAR NAME="SCRIPT_NAME" -->' name="form1"

! 	      onsubmit="return checkFields(this);" target="_blank">

! 		

! 		<table cellpadding="3" border=0 class="myTable">

! 			<!-- TMPL_IF NAME="ERROR" -->

! 			<tr align="center">

! 				<td colspan="2" >

! 					<p style="font-size:13pt;color:red">Can't find inventary codes on that range. Please try again.</p>

! 				</td>

! 			</tr>

! 			<!-- /TMPL_IF -->

!   			<tr valign="top">

! 				<td align="right" style="width:50%;padding-right:20px"> 

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Type of Interval</td>

! 						</tr>

! 						<tr align="right">

! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="width:50%;padding-left:20px"> 

! 					<div id="continuous" class="panel" style="display:inline">

! 						<table class="ranges">

! 							<tr>

! 					   			<td>From:</td> 

! 								<td><input id="from" type="text" name="from" size="20"></td>

! 							</tr>

! 							<tr>

! 					   			<td>To:</td>

! 								<td><input id="to" type="text" name="to" size="20"></td>

! 							</tr>

! 						</table>

! 					</div> 

!  				    <div id="individuals" class="panel" style="display:none">

! 						<table class="ranges">

! 							<tr valign="top">

! 								<td width="5%">

! 									Inventary Code <BR>

! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">

! 								<td>

! 								<td align="center">	

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"

! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">

! 								</td>

! 								<td width="95%">		   

! 									<select id='inventaryList' size='5' style="width:150px">

! 									</select>

! 									<input type="hidden" id='individualCodes' name="individualCodes">																						

! 								</td>

! 							</tr>

! 						</table>	

! 					</div>						

! 				</td> <!-- Fin Rangos -->

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-right:20px">

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Country Code</td>

! 						</tr>

! 						<tr align="right">

! 							<td>

! 								<div style="display:inline">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" 

! 									     style="vertical-align:bottom;cursor:pointer"

! 									     onclick="javascript: addCountryCode()">

! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->

! 								</div>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="padding-left:20px"> 

! 					<table style="border:0px">

! 						<tr>

! 							<td>Page Size</td>

! 						</tr>

! 						<tr>

! 							<td>

! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"

! 								       size="10">

! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-left:20px">Text under label</td>

! 				<td>

! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be put instead

! 				</td>

! 			</tr>

!   			<tr valign="top">

!   			    <td colspan="2" align="center">

! 			    	<table style='width:50%'>

! 						<tr style="border-color:#000FCD">

! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>

! 						</tr>

! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->

! 							<tr style="align:left">

! 								<!-- TMPL_LOOP NAME="columns" -->

! 									<td style="border:1px solid #000000">

! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->"      

! 										       name="label" <!-- TMPL_VAR NAME="check" -->>

! 										       Label  <!-- TMPL_VAR NAME="labelname" -->

! 									</td>

! 								<!-- /TMPL_LOOP -->

! 							</tr>

! 						<!-- /TMPL_LOOP -->  			    

! 					</table>

! 				</td>

!   			</tr>

!   			<tr valign="top">

!   			    <td align="right">

! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">

! 				</td>

!   			    <td align="left">

!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">

! 				</td>

!   			</tr>

! 		</table>		

! 	</form>

! </div>

! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->

--- 1,180 ----
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div class="countryPanel" style="position:absolute" id="addCountryCode">
!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
! 		<input type="hidden" name="addCode" value="1">
! 		<table style="background-color:#EFEFEF;border:1px" align="center">
! 			<tr>
! 				<th colspan="2">
! 					Add a new Country Code
! 				</th>
! 			</tr>
! 			<tr>
! 				<td>
! 					Country Name &nbsp;<input type="text" size="10" id="countryName" name="countryName"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 				<td>
! 					Country Code &nbsp;<input type="text" size="3" id="countryCode" name="countryCode"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">
! 					<input type="submit" name="submit" id="submit" value="Save Code"/>
! 				</td>
! 				<td align="left">
! 					<input type="button" name="cancel" id="cancel" value="Cancel"
! 					       onclick="document.getElementById('addCountryCode').style.display = 'none'"/>
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
! </div>
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div id="mainbloc">
! 	<h1>Barcodes Generator</h1>
! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">
! 		<tr valign="center">
! 			<td><font size="4">Generate barcodes from inventory codes</font></td>
! 		</tr>
! 	</table>
! 	<ul>
! 		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
! 		<li>Select the standard type to generate barcodes.</li>
! 		<li>Define the page size for output the PDF.</li>
! 		<li>Depending on page size, Koha will show you how the page is arranged
! 		    for each barcode. You can define wich point to start printing the page.
! 		</li>
! 	</ul>
! 	<br>
! 	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
! 		
! 		<table cellpadding="3" border=0 class="myTable">
! 			<!-- TMPL_IF NAME="ERROR" -->
! 			<tr align="center">
! 				<td colspan="2" >
! 					<p style="font-size:13pt;color:red">Can't find inventory codes in that range. Please try again.</p>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_IF -->
!   			<tr valign="top">
! 				<td align="right" style="width:50%;padding-right:20px"> 
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Type of Interval</td>
! 						</tr>
! 						<tr align="right">
! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="width:50%;padding-left:20px"> 
! 					<div id="continuous" class="panel" style="display:inline">
! 						<table class="ranges">
! 							<tr>
! 					   			<td>From:</td> 
! 								<td><input id="from" type="text" name="from" size="20"></td>
! 							</tr>
! 							<tr>
! 					   			<td>To:</td>
! 								<td><input id="to" type="text" name="to" size="20"></td>
! 							</tr>
! 						</table>
! 					</div> 
!  				    <div id="individuals" class="panel" style="display:none">
! 						<table class="ranges">
! 							<tr valign="top">
! 								<td width="5%">
! 									Inventory Code <BR>
! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
! 								<td>
! 								<td align="center">	
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"
! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">
! 								</td>
! 								<td width="95%">		   
! 									<select id="inventaryList" size="5" style="width:150px">
! 									</select>
! 									<input type="hidden" id="individualCodes" name="individualCodes">																						
! 								</td>
! 							</tr>
! 						</table>	
! 					</div>						
! 				</td> <!-- Fin Rangos -->
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-right:20px">
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Country Code</td>
! 						</tr>
! 						<tr align="right">
! 							<td>
! 								<div style="display:inline">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:bottom;cursor:pointer" onclick="addCountryCode();">
! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
! 								</div>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="padding-left:20px"> 
! 					<table style="border:0px">
! 						<tr>
! 							<td>Page Size</td>
! 						</tr>
! 						<tr>
! 							<td>
! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"
! 								       size="10">
! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-left:20px">Text under label</td>
! 				<td>
! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be used instead
! 				</td>
! 			</tr>
!   			<tr valign="top">
!   			    <td colspan="2" align="center">
! 			    	<table style="width:50%">
! 						<tr style="border-color:#000FCD">
! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
! 						</tr>
! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
! 							<tr style="align:left">
! 								<!-- TMPL_LOOP NAME="columns" -->
! 									<td style="border:1px solid #000000">
! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
! 								<!-- /TMPL_LOOP -->
! 							</tr>
! 						<!-- /TMPL_LOOP -->  			    
! 					</table>
! 				</td>
!   			</tr>
!   			<tr valign="top">
!   			    <td align="right">
! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">
! 				</td>
!   			    <td align="left">
!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">
! 				</td>
!   			</tr>
! 		</table>		
! 	</form>
! </div>
! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan  4 23:32:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 14:32:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/barcodes barcodes.tmpl,NONE,1.1 printerConfig.tmpl,NONE,1.1
Message-ID: <E1ClxE5-00013S-Cn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4015/koha-tmpl/intranet-tmpl/npl/en/barcodes

Added Files:
	barcodes.tmpl printerConfig.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- ******************************************************************************************************** -->
<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
<!-- ******************************************************************************************************** -->

<div class="data">
	<h1>Barcodes Generator</h1>
	<ul>
		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
		<li>Select the standard type to generate barcodes.</li>
		<li>Define the page size for output the PDF.</li>
		<li>Depending on page size, Koha will show you how the page is arranged
		    for each barcode. You can define wich point to start printing the page.
		</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
		
		<table class="myTable" border="1">
		<caption>Generate barcodes from inventory codes</caption>
			<!-- TMPL_IF NAME="ERROR" -->
			<tr>
				<td colspan="2">
					<p class="error">Can't find inventory codes in that range. Please try again.</p>
				</td>
			</tr>
			<!-- /TMPL_IF -->
  			<tr>
				<td><label for="rangeType">Type of Interval:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
				<td> 
					<div id="continuous" class="panel" style="display:inline">
						<table class="ranges">
							<tr>
					   			<td>From:</td> 
								<td><input id="from" type="text" name="from" size="20"></td>
							</tr>
							<tr>
					   			<td>To:</td>
								<td><input id="to" type="text" name="to" size="20"></td>
							</tr>
						</table>
					</div> 
 				    <div id="individuals" class="panel" style="display:none">
						<table class="ranges">
							<tr>
								<td width="5%">
									Inventory Code <BR>
									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
								<td>
								<td>	
									<a href="#" onclick="addItem(); return false;">&lt;&lt;</a><br>
									<a href="#" onclick="removeItem(); return false;">&gt;&gt;</a>
								</td>
								<td width="95%">		   
									<select id="inventaryList" size="5" style="width:150px">
									</select>
									<input type="hidden" id="individualCodes" name="individualCodes">																						
								</td>
							</tr>
						</table>	
					</div>						
				</td> <!-- Fin Rangos -->
			</tr>
			<tr> 
				<td><label for="numbersystem">Country Code:</label> <div style="display:inline">
									<a href="#" onclick="addCountryCode(); return false;">+</a>
									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
									<div class="countryPanel" style="position:absolute" id="addCountryCode">
 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
		<input type="hidden" name="addCode" value="1">
		<table>
			<tr><th colspan="2">Add a new Country Code</th></tr>
			<tr><td><label for="countryName">Country Name:</label></td><td><input type="text" size="10" id="countryName" name="countryName" /></td></tr>
			<tr><td><label for="countryCode">Country Code:</label></td><td><input type="text" size="3" id="countryCode" name="countryCode" /></td></tr>
			<tr>
				<td><input type="submit" name="submit" id="submit" value="Save Code" class="submit" /></td>
	<td><input type="button" name="cancel" id="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" class="cancel" /></td></tr>
		</table>
	</form>
</div>
								</div>
				</td>
				<td><label for="pageType">Page Size</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></td>
			</tr>
			<tr> 
				<td colspan="2"><label for="text_under_label">Text under label: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> <p>If this field is empty, author and title will be used instead</p></td>
			</tr></table>

						    	<table style="width:50%">
						<tr>
							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
						</tr>
						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
							<tr>
								<!-- TMPL_LOOP NAME="columns" -->
									<td style="white-space: nowrap;">
										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
								<!-- /TMPL_LOOP -->
							</tr>
						<!-- /TMPL_LOOP -->  			    
					</table>
					
<p><input type="submit" value="Generate Barcodes" name="B1" class="submit"></p>
	</form>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcode Generator Printer Configuration<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

	<h1>Printer Configuration</h1>
	<h3>Set the printer configuration corresponding to your environment</h3>
	<ul>
		<li>Set width and height of the label that you are going to work with.</li>
		<li>Set your system's default DPI.</li>
		<li>Set the page size.</li>
		<li>Select how many columns and rows are in your page size.</li>
		<li>Set the left margin bottom margin the page that you are going to use. This parameters will help to center the barcodes into the labels.</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
		<input type="hidden" name="saveSettings" value="1">
		<div class="table"><table border="1" class="myTable">
			<tr>
				<th>Label width (in mm)</th>
				<th>Label height (in mm)</th>
				<th>System DPI</th>
				<th>Page Size</th>
				<th>Columns</th>
				<th>Rows</th>
				<th>Margin Bottom (mm)</th>
				<th>Margin Left (Expressed in mm)</th>
			<tr>
  			<tr>
				<td> <input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->"></td>
				<td><input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->"></td>
				<td><input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->"></td>
				<td><select name="pageType" id="pageType" size="1">
						<!-- TMPL_IF name="A4" -->
							<option value="A4" selected>A4</option>
				        <!-- TMPL_ELSE -->
							<option value="A4">A4</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Letter" -->
							<option value="Letter" selected>Letter</option>
				        <!-- TMPL_ELSE -->
							<option value="Letter">Letter</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Legal" -->
							<option value="Legal" selected>Legal</option>
				        <!-- TMPL_ELSE -->
							<option value="Legal">Legal</option>
						<!-- /TMPL_IF -->
		            </select></td>
  			    <td><input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->"></td>
  			    <td><input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->"></td>
  			    <td><input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->"></td>
  			    <td><input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->"></td>
  			</tr></table></div>
<p>		<input type="submit" value="Save Settings" class="submit"></p>
	</form>

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:31:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:31:20 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.22,1.23 Install.pm,1.87,1.88 koha.upgrade,1.16,1.17
Message-ID: <E1CmCC0-00074e-Ff@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147/misc

Modified Files:
	buildrelease Install.pm koha.upgrade 
Log Message:
minor update just before releasing official 2.2.0

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** buildrelease	16 Nov 2004 13:04:18 -0000	1.22
--- buildrelease	5 Jan 2005 14:31:06 -0000	1.23
***************
*** 219,223 ****
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! system("cvs update -P");
  if ($cvstag) {
      print qq|
--- 219,223 ----
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! # system("cvs update -P");
  if ($cvstag) {
      print qq|

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** Install.pm	3 Jan 2005 11:11:10 -0000	1.87
--- Install.pm	5 Jan 2005 14:31:17 -0000	1.88
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 149,153 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 1819,1823 ****
  such as DANMARC.  We would like to hear from you if you do.
  
! UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
--- 1819,1824 ----
  such as DANMARC.  We would like to hear from you if you do.
  
! *** UPGRADE ***
! If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
***************
*** 1827,1833 ****
  
    en : default language, all pages available
!   fr : complete translation (except pictures)
!   es : partial librarian site translation (including pictures)
!   pl : complete OPAC and partial librarian translation
    zh_TW : partial translation
  
--- 1828,1833 ----
  
    en : default language, all pages available
!   fr : complete translation
!   es : partial librarian site translation
    zh_TW : partial translation
  

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** koha.upgrade	23 Nov 2004 16:02:33 -0000	1.16
--- koha.upgrade	5 Jan 2005 14:31:17 -0000	1.17
***************
*** 15,34 ****
  loadconfigfile();
  
! my $kohaversion=`cat koha.version`;
! chomp $kohaversion;
! Install::setkohaversion $kohaversion;
  
  
! if ($kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
! 
! unless ($answer =~/y/i) {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
- } else {
- 	print "Great! continuing upgrade... \n";
  };
  
--- 15,33 ----
  loadconfigfile();
  
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! Install::setkohaversion $::newversion;
  
  
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
! if ($answer eq "Y" || $answer eq "y") {
! 	print "Great! continuing upgrade... \n";
! } else {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
  };
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist.tmpl,1.7,1.8
Message-ID: <E1CmCDA-00078D-7s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27401/koha-tmpl/intranet-tmpl/default/en/authorities

Modified Files:
	searchresultlist.tmpl 
Log Message:


Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** searchresultlist.tmpl	2 Dec 2004 16:41:07 -0000	1.7
--- searchresultlist.tmpl	5 Jan 2005 14:32:30 -0000	1.8
***************
*** 43,47 ****
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist='<!-- TMPL_VAR NAME="biblio_fields" -->'&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
--- 43,47 ----
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.11,1.12
Message-ID: <E1CmCDb-00079k-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	about.tmpl 
Log Message:
updated credits for 2.2 release

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** about.tmpl	19 Jul 2004 21:41:29 -0000	1.11
--- about.tmpl	5 Jan 2005 14:32:56 -0000	1.12
***************
*** 3,98 ****
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
- 	
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Koha version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>OS version (from 'uname -a'):</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Perl version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>MySQL version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Apache version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Credits</td>
! 			<td>
! 				<h2>Core team</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>, Kaitiaki<br/>
! 							<b>Paul Poulain</b>, 2.2 release manager (MARC developper)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco, (Documentation Compiler)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, French Translation<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							<b>Horowhenua Library Trust</b> : Rosalie Blake, Head of Libraries<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Thanks to</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polish for 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri-Damien Laurent<br/>
! 							J�rome Vizcaino (Esiee School)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee School)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Esiee School)<br/>
! 							Pawel Skuza (Polish for 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 3,72 ----
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<div id="bloc25">
! 		<h2>Server information</h2>
! 		<p><label class="label100">Koha version</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">OS version ('uname -a')</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">Perl version</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">MySQL version</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Special thanks to the following funders</h2>
! 		<p><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
! 		<p>The <b>Nelsonville Public Library</b> (MARC support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>ENSMP (Ecole Nationale Sup�rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Core team for 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</p>
! 		<p>Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
! 		<p>Nicholas Rosasco, (Documentation Compiler)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Thanks to</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) OPAC basket</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee School</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri-Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin (French Translation in 2.0)</p>
! 					<p>Pawel Skuza (Polish for 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:33:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:33:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.3,1.4 auth.tmpl,1.3,1.4 bookcount.tmpl,1.3,1.4 boraccount.tmpl,1.6,1.7 charges.tmpl,1.3,1.4 intranet-main.tmpl,1.8,1.9 modbibitem.tmpl,1.3,1.4 moditem.tmpl,1.3,1.4 overdue.tmpl,1.3,1.4 reports.tmpl,1.3,1.4 request.tmpl,1.7,1.8 shelves.tmpl,1.3,1.4 thesaurus_popup.tmpl,1.5,1.6
Message-ID: <E1CmCE1-0007CD-3y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27604/koha-tmpl/intranet-tmpl/default/fr

Modified Files:
	about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl 
	charges.tmpl intranet-main.tmpl modbibitem.tmpl moditem.tmpl 
	overdue.tmpl reports.tmpl request.tmpl shelves.tmpl 
	thesaurus_popup.tmpl 
Log Message:
french version for 2.2.0

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/about.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** about.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- about.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 2,96 ****
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" -->   <h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Version Koha</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version de l'OS (depuis 'uname -a) :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>version PERL :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version MySQL</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version Apache :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Cr�dits</td>
! 			<td>
! 				<h2>Contributeurs principaux</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>,Kaitiaki<br/>
! 							<b>Paul Poulain</b>, responsable de la version 2.2 (d�veloppeur MARC)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco,(r�dacteur de la documentation)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, traduction fran�aise<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							 <b>Groupement de biblioth�ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth�ques<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Merci �</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polonais pour version 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri Damien Laurent<br/>
! 							J�rome Vizcaino (Esiee Paris)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Ecole Esiee)<br/>
! 							Pawel Skuza (Polonais pour la version 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 2,71 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" --> <h1>Informations sur la version actuelle de Koha pour le rapport de bogues (ou d'int�r�t g�n�ral).</h1>  \t 
! 	<div id="bloc25">
! 		<h2>Information serveur</h2>
! 		<p><label class="label100">Version Koha</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">Version de l'OS ('uname -a) :</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">version PERL :</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">Version MySQL</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Un merci particulier aux financeurs suivants</h2>
! 		<p><b>Groupement de biblioth�ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth�ques (Koha 1.0)</p>
! 		<p>La <b>Biblioth�que Publique de Nelsonville</b> (support MARC)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (modules suggestion et stats, support ldap am�lior�)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Contributeurs principaux pour la version 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, responsable de la version 2.2 (d�veloppeur MARC)</p>
! 		<p>Stephen Hedges et La <b>Biblioth�que Publique de Nelsonville</b> (Financement du codage MARC)</p>
! 		<p>Nicholas Rosasco,(r�dacteur de la documentation)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray et <b>Turo Technology LLP</b>, (contr�le qualit�, installation et mise � jour, maintenance de la version 2.0)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>et Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Merci �</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polonais pour version 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) panier OPAC</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin, (traduction fran�aise 2.0)</p>
! 					<p>Pawel Skuza (Polonais pour la version 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (pr�paration MARC, conception des Etag�res virtuelles, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- auth.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 18,22 ****
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2> Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r�essayer.</h2>
  <!-- /TMPL_IF -->
  
--- 18,22 ----
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2>Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r�essayer.</h2>
  <!-- /TMPL_IF -->
  

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bookcount.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- bookcount.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE BARRE <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
--- 5,9 ----
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE A BARRES <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
***************
*** 11,15 ****
  		<td width="440">
  
! 		</b> <!-- TMPL_VAR NAME="homebranch" -->'><b>Site d'origine: </b>  <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv�e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
--- 11,15 ----
  		<td width="440">
  
! 		<b>Site d'origine: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv�e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** boraccount.tmpl	24 Nov 2004 16:22:25 -0000	1.6
--- boraccount.tmpl	5 Jan 2005 14:33:21 -0000	1.7
***************
*** 3,7 ****
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour</h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr�er une facture manuelle</a>
  <center>
--- 3,7 ----
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr�er une facture manuelle</a>
  <center>

Index: charges.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** charges.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- charges.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 4,9 ****
  
  <p>
! Each box needs to be filled in with fine,time to start charging,charging cycle<br>
!  par exemple 1,7,7 signifie 1EUR d'amende, apr�s 7 jours, tous les 7 jours.<p>
  
  <table>
--- 4,9 ----
  
  <p>
! Chaque cellule doit �tre remplie avec l'amende, l'�ch�ance et la dur�e des charges<br>
! par exemple 1,7,7 signifie 1EUR d'amende, apr�s 7 jours, tous les 7 jours.<p>
  
  <table>

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** intranet-main.tmpl	24 Nov 2004 16:22:25 -0000	1.8
--- intranet-main.tmpl	5 Jan 2005 14:33:21 -0000	1.9
***************
*** 74,78 ****
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Search a biblio. When this biblio is found, you can check its status, reserve it, or see where it is</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth�que</p>
--- 74,78 ----
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Rechercher une notice.Quand ce document est trouv�, vous pouvez v�rifier son �tat, faire une r�servation, ou bien voir o� il se trouve</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth�que</p>
***************
*** 80,86 ****
  				<p>Gestion des abonnements et des p�riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag�res Virtuelles</a>
! 				<p>Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one.
! 				The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic.
! 				It can be used by a library to define "most valuable books for &lt;some category of patron&gt;"</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
--- 80,84 ----
  				<p>Gestion des abonnements et des p�riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag�res Virtuelles</a>
! 				<p>Les �tag�res virtuelles peuvent �tre utilis�es par des biblioth�caires ou des usagers pour constituer des biblioth�ques virtuelles au sein de la vraie. L'�tag�re virtuelle peut �tre utilis� par un enseignant pour aider ses �l�ves dans la recherche d'information sur un sujet particulier.On peut l'utiliser  dans une biblioth�que pour indiquer des listes de documents (les plus emprunt�s, les plus repr�sentatifs...).</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
***************
*** 107,122 ****
  			<p>Aller � la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Add a member in the library. The member can be attached to any branch of the library. He or she can also have children.</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit�</a>
! 			<p>Add an organisation in the library. This member doesn't have some information a "physical" member has.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Lignes de Commande, recevoir des commandes, �tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Rapports</h1>
! 			Tous les rapports syst�me
  		</div>
  		<div id="Hint5" class="hint">
--- 105,120 ----
  			<p>Aller � la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Ajouter un lecteur � la biblioth�que.Le lecteur peut-�tre rattach�  � n'importe quel site de la biblioth�que.Il ou elle peut aussi avoir des enfants</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit�</a>
! 			<p>Ajouter une collectivit� � la biblioth�que.Cette inscription ne peut contenir les m�mes informations que pour une personne physique.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Commander des documents, recevoir des commandes, �tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Bilans</h1>
! 			Tous les bilans du syst�me
  		</div>
  		<div id="Hint5" class="hint">
***************
*** 126,136 ****
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param�tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G�n�rateur de code-barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Fonds de livres</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r�servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr�t</h1>
! 			Work at the front desk on Issues and returns using only a barcode reader and a mouse
  		</div>
  <!-- MAIN MENU -->
--- 124,134 ----
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param�tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G�n�rateur de code � barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Lignes de cr�dit</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r�servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr�t</h1>
! 			A la banque de pr�t, effectuez les pr�ts et les retours, en utilisant uniquement un lecteur de code barre et une souris
  		</div>
  <!-- MAIN MENU -->
***************
*** 145,149 ****
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit�s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Rapports</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param�tres</a><br/>
--- 143,147 ----
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit�s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Bilans</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param�tres</a><br/>

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modbibitem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- modbibitem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 36,40 ****
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Localisation</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
--- 36,40 ----
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Emplacement</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
***************
*** 68,78 ****
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES BARRES<br>
! 			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code Barre</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
--- 68,78 ----
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES A BARRES<br>
! 			Pointez TOUS les codes-barres auquels les changements s'appliquent.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code � Barres</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
***************
*** 99,104 ****
  
  
! <b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
!  items, tick the appropriate ones and a new group record will be created automatically for them.
   <br clear="all">
   <p> &nbsp; </p>
--- 99,103 ----
  
  
! <b>AIDE:</b>Vous<b>devez</b>cliquer sur le bouton ad�quat (dans les pav�s verts), et choisir soit de d�placer le(s) exemplaire(s)vers un enregistrement d�j� existant dans la base, soit de modifier cet enregistrement. Si vos modifications ne concernent que quelques exemplaires, pointer ceux qui sont concern�s et une nouvelle notice sera cr��e automatiquement pour eux.
   <br clear="all">
   <p> &nbsp; </p>

Index: moditem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** moditem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- moditem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code Barre</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
--- 5,9 ----
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code � Barres</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">

Index: overdue.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overdue.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- overdue.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 6,10 ****
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Usager</th>
  		<th class="reports">T�l�phone</th>
  		<th class="reports">Titre</th>
--- 6,10 ----
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Emprunteur</th>
  		<th class="reports">T�l�phone</th>
  		<th class="reports">Titre</th>

Index: reports.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** reports.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- reports.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> rapports </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> bilans </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.tmpl	24 Nov 2004 16:22:26 -0000	1.7
--- request.tmpl	5 Jan 2005 14:33:21 -0000	1.8
***************
*** 103,107 ****
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>
--- 103,107 ----
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- shelves.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 32,36 ****
  		<tr>
  			<td>
! 				ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>
--- 32,36 ----
  		<tr>
  			<td>
! 				Ajouter un livre par code � barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>

Index: thesaurus_popup.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** thesaurus_popup.tmpl	24 Nov 2004 16:22:26 -0000	1.5
--- thesaurus_popup.tmpl	5 Jan 2005 14:33:21 -0000	1.6
***************
*** 33,37 ****
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 33,37 ----
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�: <input type="text" name="insert">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:34:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:34:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint - New directory
Message-ID: <E1CmCFA-0007H7-LO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27952/koha-tmpl/intranet-tmpl/default/fr/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint catmaintain.tmpl,NONE,1.1
Message-ID: <E1CmCFv-0007Me-B8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/maint

Added Files:
	catmaintain.tmpl 
Log Message:
french version for 2.2.0

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="cat-top.inc" -->


<!-- TMPL_IF NAME=allsub-p -->
<!-- TMPL_LOOP NAME="loop" -->
"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
Sujet:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
<input type="hidden" name="type" value="upsub">
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
<input type="submit" value="modifier">
</form>
<p>Cela changera la vedette-sujet dans toutes les notices o� ce sujet est utilis�.
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Modification r�ussie <!-- TMPL_VAR NAME="oldsub" escape=html --> est maintenant <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table border="0">
<thead>
<tr><th>Titre</th><th>Auteur</th><th>Reprendre</th></tr>
<tbody>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Reprendre</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
Annulation de suppression r�ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour � la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
<input type="hidden" name="type" value="updatetype">
Type de document : <input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
<input type="submit" value="Changer">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
Mise � jour r�ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour � la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<b>Maintenance des Sujets</b><br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="allsub">
Voir tous les sujets commen�ant par <input type="text" name="sub"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Maintenance des groupes</b></br>
<form action="/cgi-bin/koha/search.pl" method="post">
<input type="hidden" name="type" value="catmain">
Voir tous les Titres commen�ant par <input type="text" name="title"><br>
Num�ro de l'exemplaire <input type="text" size="25" name="item"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Reprendre Notice</b></br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="undel">
Voir tous les Titres commen�ant par <input type="text" name="title"><br>
<input type="submit" value="Voir">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007NK-49@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/user

Modified Files:
	userpage.tmpl 
Log Message:
french version for 2.2.0

Index: userpage.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** userpage.tmpl	24 Nov 2004 16:21:16 -0000	1.3
--- userpage.tmpl	5 Jan 2005 14:35:22 -0000	1.4
***************
*** 19,23 ****
  	</ul>
  	<p>
! 	<b>Vous avez reserv� les ouvrages en pr�t suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
--- 19,23 ----
  	</ul>
  	<p>
! 	<b>Vous avez r�serv� les documents suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
***************
*** 56,60 ****
  			<input name="overduesbyemail" type="checkbox" checked> Pr�venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox">  Autoriser l'�quipe de la biblioth�que � consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>
--- 56,60 ----
  			<input name="overduesbyemail" type="checkbox" checked> Pr�venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox"> Autoriser l'�quipe de la biblioth�que � consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc result.tmpl,1.5,1.6 search.tmpl,1.6,1.7
Message-ID: <E1CmCFx-0007NH-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/search.marc

Modified Files:
	result.tmpl search.tmpl 
Log Message:
french version for 2.2.0

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** result.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- result.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 7,39 ****
  	<h1 class="catalogue">R�sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
! 				</a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 					<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
! 		<p>
! 			<!-- TMPL_IF NAME="total" -->
! 			&nbsp;<b>R�ponses <!-- TMPL_VAR NAME="from" --> �  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --></b><br><br>
! 			<!-- TMPL_ELSE -->
! 			Pas de r�ponse<br>
! 			<!-- /TMPL_IF -->
! 		</p>
! 	</div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">Abr�g�</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
--- 7,17 ----
  	<h1 class="catalogue">R�sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr�c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
! 		<p class="resultcount"><!-- TMPL_IF NAME="total" -->R�ponses <!-- TMPL_VAR NAME="from" --> �  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->Pas de r�ponse<!-- /TMPL_IF --></p></div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">R�sum�</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
***************
*** 42,54 ****
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 					<p>
! 						<p>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- TMPL_ELSE -->
! 								<b><a class="transparent" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 							<!-- /TMPL_IF -->
! 						</p>
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
--- 20,28 ----
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
  							<!-- TMPL_ELSE -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>				<!-- /TMPL_IF -->
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
***************
*** 88,106 ****
  	</div>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
  	</div>	
  </div>
--- 62,67 ----
  	</div>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr�c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
  	</div>	
  </div>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	24 Nov 2004 16:19:00 -0000	1.6
--- search.tmpl	5 Jan 2005 14:35:22 -0000	1.7
***************
*** 8,100 ****
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search" />
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! 			<label class="label100">Ajouter un mot</label>
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Auteur</label> <input type="hidden" name="marclist" value="biblio.author" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100">Code Barre de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /> 
! 		</p>
! 		<p>
! 			<label class="label100">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  	</div>
--- 8,100 ----
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div class="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search">
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Tous les mots</label>
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="keyword" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="title">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="author">Auteur</label> <input type="hidden" name="marclist" value="biblio.author">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="subject">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">  
! 			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="itemtype">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100" for="branch">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="=">  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100" for="barcode">Code � Barres de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" id="barcode" onchange="sql_update()"> 
! 		</p>
! 		<p>
! 			<label class="label100" for="callno">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="start">
! 			<input type="text" name="value" id="callno" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="isbn">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
! 			<input type="text" name="value" id="isbn" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="publisher">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="publisher" onchange="sql_update()">
  		</p>
  	</div>
***************
*** 125,139 ****
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button catalogue" value="Ajouter un crit�re" onclick="AddStatement()" class="button catalogue">
! 		Warning : the "contains" statement does NOT work if you enter 2 or less letters
  	</div>
! 	<div id="bloc25">
! 		<p>
! 			<div name="sql">
! 				<textarea name="sql" rows="3" cols="70" disabled readonly></textarea>
! 			</div>
! 		</p>
  		<p>R�sultats par page :
! 			<select align="right" name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
--- 125,135 ----
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button" value="Ajouter un crit�re" onclick="AddStatement()" class="button catalogue">
! 		Attention : l'option "contient" NE FONCTIONNE PAS si vous n'indiquez pas au moins 3 caract�res.</p>
  	</div>
! 	<div class="bloc25">
! 		<p><textarea name="sql" rows="3" cols="70" disabled readonly></textarea></p>
  		<p>R�sultats par page :
! 			<select name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 147,151 ----
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/suggestion acceptorreject.tmpl,1.1,1.2 mail_suggestion_ACCEPTED.tmpl,1.1,1.2 mail_suggestion_AVAILABLE.tmpl,1.1,1.2 mail_suggestion_ORDERED.tmpl,1.1,1.2 mail_suggestion_REJECTED.tmpl,1.1,1.2
Message-ID: <E1CmCFx-0007NZ-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/suggestion

Modified Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
french version for 2.2.0

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- acceptorreject.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 24,28 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
--- 24,28 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->

Index: mail_suggestion_ACCEPTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ACCEPTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ACCEPTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ACCEPTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --><!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a examin� votre suggestion aujourd'hui, et l'a trouv�e int�ressante. Le document sera achet� d�s que possible. Vous serez alert� par messagerie lorsque l'acquisition sera r�alis�e, puis avertis par messagerie � nouveau lorsque le document sera � la biblioth�que. Pour toute question, adressez- vous � <!-- TMPL_VAR name="libemail" -->. Merci, <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_AVAILABLE.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_AVAILABLE.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_AVAILABLE.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_AVAILABLE.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. Nous sommes heureux de vous annoncer que le *** est maintenant dans la la biblioth�que. Si vous avez une question, n'h�sitez pas � nous �crire � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_ORDERED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ORDERED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ORDERED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ORDERED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.  You will be notified again when the book is available.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->Nous avons le plaisir de vous informer que le livre a �t� command�.Il devrait arriver bient�t � la biblioth�que.Nous vous enverrons un autre mail quand le livre sera disponible. Pour toute question, envoyez nous un message �lectronique � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_REJECTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_REJECTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_REJECTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_REJECTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait � la biblioth�que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a trait� votre demande aujourd'hui et a d�cid� de ne pas accepter votre suggestion. Si vous une question, n'h�sitez pas � nous �crire � <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports inventory.tmpl,1.2,1.3 issues_by_borrower_category.tmpl,1.1,1.2 itemtypes.tmpl,1.1,1.2 reports-home.tmpl,1.5,1.6
Message-ID: <E1CmCFx-0007NP-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/reports

Modified Files:
	inventory.tmpl issues_by_borrower_category.tmpl itemtypes.tmpl 
	reports-home.tmpl 
Log Message:
french version for 2.2.0

Index: inventory.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/inventory.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** inventory.tmpl	24 Nov 2004 16:19:00 -0000	1.2
--- inventory.tmpl	5 Jan 2005 14:35:22 -0000	1.3
***************
*** 5,14 ****
  		<h2 class="reports">S�lectionnez les exemplaires que vous souhaitez v�rifier</h2>
  		<p>
! 			Localisation de l'exemplaire (items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>voir</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen�ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
--- 5,14 ----
  		<h2 class="reports">S�lectionnez les exemplaires que vous souhaitez v�rifier</h2>
  		<p>
! 			Cote de l'exemplaire ((items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>afficher</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen�ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
***************
*** 29,33 ****
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code Barre</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>
--- 29,33 ----
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code � Barres</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>

Index: issues_by_borrower_category.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issues_by_borrower_category.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- issues_by_borrower_category.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 40,44 ****
  	<h1>Pr�ts par cat�gories de lecteurs</h1>
  	<form method="post">
! 		<p>Select a borrower category (or don't if you want to see global status) <input type="text" name="value"></p>
  		<p>S�lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">
--- 40,44 ----
  	<h1>Pr�ts par cat�gories de lecteurs</h1>
  	<form method="post">
! 		<p>S�lectionner une cat�gorie de lecteur (ou rien si vous souhaitez visualiser l'�tat global) <input type="text" name="value"></p>
  		<p>S�lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">

Index: itemtypes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** itemtypes.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- itemtypes.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 23,27 ****
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		 S�lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
--- 23,27 ----
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		S�lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">

Index: reports-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** reports-home.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- reports-home.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 2,10 ****
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Rapports</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r�gl�s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r�gl�s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Ouvrages en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r�colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>
--- 2,10 ----
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Bilans</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r�gl�s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r�gl�s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Documents en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r�colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_225a.tmpl,1.3,1.4 unimarc_field_60X.tmpl,1.4,1.5 unimarc_field_700-4.tmpl,1.3,1.4 unimarc_field_700_701_702.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007Nn-NI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_225a.tmpl unimarc_field_60X.tmpl 
	unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl 
Log Message:
french version for 2.2.0

Index: unimarc_field_225a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_225a.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_225a.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,16 ****
! <html>
! <head>
! <title>Constructeur de champ UNIMARC 225a</title>
  </head>
  <body>
! <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Selectionnez une collection</td>
! 		<td><!-- TMPL_VAR name="collection" --></td>
! 	</tr>
! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
! </table>
! </form>
  <script>
  	function report() {
--- 1,13 ----
! <!-- TMPL_INCLUDE name="auth-search-top.inc" -->
! <title>UNIMARC Field 225a builder</title>
  </head>
  <body>
! <div id="mainbloc">
! 	<form name="f_pop" onSubmit="javascript:report()">
! 		<h2 class="authority">Collection</h2>
! 		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
! 		<input type="submit" value="OK" class="button authority"></p>
! 	</form>
! </div>
  <script>
  	function report() {
***************
*** 20,23 ****
  	}
  </script>
! </body>
! </html>
--- 17,19 ----
  	}
  </script>
! <!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->

Index: unimarc_field_60X.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_60X.tmpl	24 Nov 2004 16:21:17 -0000	1.4
--- unimarc_field_60X.tmpl	5 Jan 2005 14:35:23 -0000	1.5
***************
*** 1,5 ****
  <html>
  <head>
! 	<title>Recherche Th�saurus</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! 	<title>Thesaurus search</title>
  </head>
  <body>
***************
*** 38,42 ****
  	<tr>
  		<td valign="top">
! 		<h2>R�ponses</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
--- 38,42 ----
  	<tr>
  		<td valign="top">
! 		<h2>Results</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
***************
*** 57,61 ****
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>D�pendances</h2>
  			<!-- /TMPL_IF -->
  			<table>
--- 57,61 ----
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>Dependancies</h2>
  			<!-- /TMPL_IF -->
  			<table>
***************
*** 73,82 ****
  	</tr>
  	</table>
! <h2>Ajout en cours</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Cr�er une nouvelle autorit�/entr�e au th�saurus : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>
--- 73,82 ----
  	</tr>
  	</table>
! <h2>Adding</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>

Index: unimarc_field_700-4.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700-4.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700-4.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 11,15 ****
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>Illustrateur</option>
  			<option value="080 - pr�face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr�face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
--- 11,15 ----
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
  			<option value="080 - pr�face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr�face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>

Index: unimarc_field_700_701_702.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700_701_702.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700_701_702.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,5 ****
  <html>
  <head>
! <title>Constructeur d'autorit� nom de personne</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! <title>Personal Authorities builder</title>
  </head>
  <body>
***************
*** 14,18 ****
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="FIN" onclick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
--- 14,18 ----
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="END" onClick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
***************
*** 30,34 ****
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 30,34 ----
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit�: <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ branchtransfers.tmpl,1.6,1.7 circulation.tmpl,1.10,1.11 returns.tmpl,1.6,1.7
Message-ID: <E1CmCGP-0007P7-QQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** branchtransfers.tmpl	24 Nov 2004 16:14:37 -0000	1.6
--- branchtransfers.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 6,10 ****
  
  <h1>Pr�t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" -->   <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer Param�tres</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,10 ----
  
  <h1>Pr�t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" --> <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer R�glages</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 84,88 ****
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
--- 84,88 ----
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code � barres : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
***************
*** 106,110 ****
  		</select></p>
  
! 	<p><b>Entrez le Code Barre du document :</b> Code Barre du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
--- 106,110 ----
  		</select></p>
  
! 	<p><b>Entrez le Code � Barres du document :</b> Code � Barres du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
***************
*** 120,124 ****
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf�r�s</th></tr>
! 		<tr><th>Code Barre</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>�</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 120,124 ----
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf�r�s</th></tr>
! 		<tr><th>Code � Barres</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>�</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** circulation.tmpl	24 Nov 2004 16:14:38 -0000	1.10
--- circulation.tmpl	5 Jan 2005 14:35:19 -0000	1.11
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Circulation : pr�ts</h1>
  
  <!--
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Pr�t : Sorties</h1>
  
  <!--
***************
*** 11,15 ****
  		<h2 class="circulation">Param�tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param�tres</a>
  		</p>
  	
--- 11,15 ----
  		<h2 class="circulation">Param�tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R�glages</a>
  		</p>
  	
***************
*** 41,45 ****
  			</p>
  			<p>Cat�gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Pr�ts<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
--- 41,45 ----
  			</p>
  			<p>Cat�gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
***************
*** 65,70 ****
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code barre du livre</h2>
! 		<p>Code Barre de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr�ter" class="button circulation"></p>
  		<p>
  			<select name="day">
--- 65,70 ----
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code � barres du livre</h2>
! 		<p>Code � Barres de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr�ter" class="button circulation"></p>
  		<p>
  			<select name="day">
***************
*** 152,156 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code barre est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 152,156 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code � barres est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 196,199 ****
--- 196,205 ----
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
  			<form method="post">
+ 				<!-- TMPL_IF NAME="RESERVED" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r�servation</p>
+ 				<!-- /TMPL_IF -->
+ 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r�servation</p>
+ 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">">
***************
*** 203,206 ****
--- 209,213 ----
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
  				<input type="submit" value="Confirmer le pr�t" class="button circulation">
+ 				<a href="circulation.pl?borrnumber=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button circulation">Ne pas pr�ter</a>
  			</form>
  			<!-- /TMPL_UNLESS -->
***************
*** 224,228 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 231,235 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code � Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
***************
*** 253,257 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 260,264 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code � Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** returns.tmpl	24 Nov 2004 16:14:38 -0000	1.6
--- returns.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 4,8 ****
  	<h1 class="circulation">Pr�t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param�tres</a>
  	</p>
  	
--- 4,8 ----
  	<h1 class="circulation">Pr�t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R�glages</a>
  	</p>
  	
***************
*** 11,15 ****
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
! 			<p> Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not� en attente � <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
--- 11,15 ----
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
! 			<p>Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not� en attente � <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 25,29 ****
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
  				<p>
! 					Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  needs to be transfered to <b><!-- TMPL_VAR NAME="branchname" --></b>  to be picked up by  <!-- TMPL_VAR NAME="name" -->  (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
--- 25,29 ----
  				<h2 class="circulation">Exemplaire marqu� 'En attente' :</h2>
  				<p>
! 					L'exemplaire: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) doit �tre transf�r� � <b><!-- TMPL_VAR NAME="branchname" --></b> pour �tre retir� par <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
***************
*** 43,47 ****
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R�servation trouv�e</h2>
! 				<p>Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">  <!-- TMPL_VAR NAME="itembarcode" -->  </a>  for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
--- 43,47 ----
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R�servation trouv�e</h2>
! 				<p>Exemplaire : <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) peut �tre retir� � <b> <!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
***************
*** 84,89 ****
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code barre du livre</h2>
! 				<label class="label20">Code Barre de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
--- 84,89 ----
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code � barres du livre</h2>
! 				<label class="label20">Code � Barres de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 100,104 ****
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
--- 100,104 ----
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code � barres : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
***************
*** 119,123 ****
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur l'ouvrage rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
--- 119,123 ----
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur le document rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
***************
*** 162,174 ****
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Ouvrages rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code Barre</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Lecteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->
--- 162,174 ----
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Documents rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code � Barres</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Emprunteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help bull-home.tmpl,1.1,1.2
Message-ID: <E1CmCGP-0007PB-V2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help

Modified Files:
	bull-home.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:50 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 2,11 ****
  	<h1>Aide de Abonnement P�riodiques</h1>
  	<ul>
! 		<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  		<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv� l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d�tails de l'abonnement</li>
! 				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC & librarian interface)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 2,11 ----
  	<h1>Aide de Abonnement P�riodiques</h1>
  	<ul>
! 		<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  		<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv� l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d�tails de l'abonnement</li>
! 				<li>Recevoir chaque num�ro et/ou g�r� ce qui s'affiche dans le r�sum� de l'abonnement (� l'OPAC et dans l'interface biblioth�caire)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1CmCGQ-0007PD-2h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
french version for 2.2.0

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	24 Nov 2004 16:13:32 -0000	1.2
--- addbookbybiblionumber.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 6,11 ****
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter une �tag�re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<input type="submit" value="Ajouter une �tag�re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 6,19 ----
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter dans l'�tag�re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<p>ou ajouter une nouvlle �tag�re virtuelle </p>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 		<select name="category">
! 			<option value="1">Priv�</option>
! 			<option value="2">Publique</option>
! 			<option value="3">Libre</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Ajouter dans l'�tag�re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	24 Nov 2004 16:13:33 -0000	1.2
--- shelves.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 4,63 ****
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Contenus de <!-- TMPL_VAR NAME="shelfname" -->
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="itemsloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  				</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<br>
! 		<a href="shelves.pl" class="button">Liste des �tag�res</a>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<!-- TMPL_IF name="manageshelf" -->
! 			<input type="submit" value="Retirer les Exemplaires S�lectionn�s" class="button">
! 		<!-- /TMPL_IF -->
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<form>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<table>
! 			<tr>
! 				<td>
! 					ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
! 				</td>
! 				<td>
! 					<input name="addbarcode">
! 					<input type="hidden" name="modifyshelfcontents" value="1">
! 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 					<input type="submit" value="Enregistrer" class="button">
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
- 		<h1 class="catalogue">Etag�res</h1>
  		<div id="bloc25">
  					<h2 class="catalogue">S�lectionner les Etag�res � Supprimer</h2>
--- 4,64 ----
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div id="bloc25">
! 		<h2 class="catalogue">Contenu des Etag�res</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th class="catalogue">supprimer</th>
! 					<th class="catalogue">Code � Barres</th>
! 					<th class="catalogue">Titre</th>
! 					<th class="catalogue">Auteur</th>
  				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Retirer les Exemplaires S�lectionn�s" class="button catalogue">
! 			<!-- /TMPL_IF -->
! 		</div>
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc25">
! 		<form>
! 		<h2 class="catalogue">Ajouter un livre par code � barre</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Enregistrer" class="button catalogue">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
+ 	<div id="bloc25">
+ 		<a href="shelves.pl" class="button catalogue">Liste des �tag�res</a>
+ 	</div>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1 class="catalogue">Etag�res</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  		<div id="bloc25">
  					<h2 class="catalogue">S�lectionner les Etag�res � Supprimer</h2>
***************
*** 70,74 ****
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
  						</p>
  						<!-- /TMPL_IF -->
--- 71,75 ----
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"> <!-- TMPL_VAR NAME="shelfname" --> </a> (<!-- TMPL_VAR NAME="shelfbookcount" --> document(s))
  						</p>
  						<!-- /TMPL_IF -->
***************
*** 92,98 ****
  					</select>
  				</p>
! 				<p> <li> une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
! 					<li>  Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
! 					<li> Une �tag�re libre peut-�tre g�r�e par tous les usagers</li>
  				</p>
  				<p>
--- 93,99 ----
  					</select>
  				</p>
! 				<p> <li>une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
! 					<li> Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
! 					<li> Une �tag�re libre peut-�tre g�r�e par tous les utilisateurs.</li>
  				</p>
  				<p>
***************
*** 104,128 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Liste des Etag�res
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des �tag�res virtuelles</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
--- 105,191 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc25">
! 			<h2 class="catalogue">Liste des �tag�res</h2>
! 			<table class="small">
! 				<tr>
! 					<th class="catalogue">Nom de l'�tag�re</th>
! 					<th class="catalogue">Cat�gorie</th>
! 					<th class="catalogue">Contenu</th>
! 					<th class="catalogue">Modifier</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Priv�
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Publique
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Libre
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> documents
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modifier</a> <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc25">
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des �tag�res virtuelles</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc25">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2 class="catalogue">Modifier l'�tag�re</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Nom</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Propri�taire</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Cat�gorie</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Priv�</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Priv�</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Publique</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Publique</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Libre</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Libre</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>une �tag�re priv�e est g�r�e par vous et peut �tre vue uniquement par vous- m�me.</li>
+ 				<li> Une �tag�re publique peut-�tre vue par tout le monde, mais g�r�e uniquement par vous-m�me</li>
+ 				<li> Une �tag�re libre peut-�tre g�r�e par tous les utilisateurs.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Enregistrer" class="button catalogue">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pc-Bm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/circ

Modified Files:
	circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** circulation.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- circulation.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Circulation : pr�ts</h1>
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>
  
! <p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>
  
! <p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>
  
! <p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
! <p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,11 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Pr�t/Aide des sorties</h1>
! <p>Avant de commencer, il est tr�s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n�cessaire.Cela devra �tre fait seulement la premi�re fois que vous ferez du pr�t (ou des retours) � partir d'un poste de travail, ensuite un cookie du navigateur m�morisera le r�glage correct.</p>
  
! <p>Maintenant commencez par scanner le code � barres du lecteur ou tapez son nom pour trouver leur compte.Lorsque Koha a trouv� un lecteur, vous verrez un nouveau pav� pour scanner ou taper le num�ro identifiant le document (en g�n�ral un code � barres).</p>
  
! <p>Si vous souhaitez que ce document et les documents suivants de cette transaction aient une date de retour autre que la date par d�faut d�finie pour ce type de document utilisez la "date de retour manuelle" pour choisir la date de retour avant de scanner le premier document.</p>
  
! <p>Si le pr�t n'a rien de sp�cial, il sera fait imm�diatement et affich� (avec les autres emprunts du lecteur)en bas de la page.</p>
! <p>Si le pr�t pose probl�me, alors un autre pav� appara�tra (en <b>ROUGE</b>) et vous demandera de confirmer que le pr�t est possible.Si le pr�t est vraiment impossible (par exemple le code � barres n'existe pas), alors vous ne pouvez pas le confirmer.Si le pr�t est possible mais n�cessite confirmation (comme pour un document pr�t� � un autre lecteur, ou un lecteur ayant emprunt� trop de docuements), vous pourrz alors confirmer le pr�t.Si la confirmation implique une autre op�ration (si le document est pr�t� � un autre lecteur, le pr�t� implique que le retour soir fait), alors elle sera aussi effectu�e.</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** returns.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- returns.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,9 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>
  
! <p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>
  
! <p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
! <p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
! <p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,9 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Avant de commencer, il est tr�s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n�cessaire. Cela devra �tre fait seulement la premi�re fois que vous ferez du pr�t (ou des retours) � partir d'un poste de travail, ensuite un cookie du navigateur m�morisera le r�glage correct.</p>
  
! <p>Maintenant scannez simplement ou tapez le num�ro identifiant du document (habituellement un code � barres)dans le pav� propos�.</p>
  
! <p>Le retour est fait et s'il y a quelque chose de particulier sur le document ou l'emprunteur (comme un emprunteur ayant des dettes), un pav� rouge vous en avertira</p>
! <p>Si le document a �t� r�serv� par quelqu'un d'autre, on vous demandera aussi de valider la r�servation.Si vous la confirmez, le document est mis � l'�tat "en attente" et vous devrez avertir le lecteur que le docuement est disponible.</p>
! <p>Si le document est r�serv� par quelqu'un d'un autre site, vous devez aussi valider le transfert</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.4,1.5
Message-ID: <E1CmCGQ-0007PK-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** breeding.tmpl	24 Nov 2004 16:16:53 -0000	1.4
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.5
***************
*** 6,12 ****
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�e</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
--- 6,12 ----
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�es</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import� parce qu'ils ne semblent pas �tre au format MARC (ou n� ISBN/ ISSN manquant) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
***************
*** 14,21 ****
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 		<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 		<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 		<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 14,21 ----
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>S�lectionner un fichier � importer dans le r�servoir.Il sera analys�, et pour chaque ISBN trouv�, une nouvelle copie sera cr�� dans le r�servoir.</li>
! 		<li>Si un ISBN existe d�j� dans le r�servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'�craser l'ancien.</li>
! 		<li>Vous pouvez donner un nom � cette importation. Cela peut �tre utile, lors de la cr�ation d'une notice, pour vous souvenir d'o� vient l'enregistrement MARC propos�!</li>
! 		<li>Bien s�r, si l'ISBN existe d�j� dans la base de donn�es, la notice sera ignor�e.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc search.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PN-45@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/search.marc

Modified Files:
	search.tmpl 
Log Message:
french version for 2.2.0

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 3,27 ****
  	<p>La recherche est divis�e en deux parties diff�rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p> Les champs usuels sont dans la partie haute de l'�cran. Ils contiennent :</p>
  		<ul>
! 			<li>Mot cl� :  Recherche sur l'ensemble</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code Barre : le code barre de la bibloth�que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
! 			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
  		</ul>
  	<p>M�thode de Recherche</p>
  		<ul>
! 			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
! 			<li> Une notice est s�lectionn�e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>inf�rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen�ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignor�</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,27 ----
  	<p>La recherche est divis�e en deux parties diff�rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p>Les champs usuels sont dans la partie haute de l'�cran. Ils contiennent :</p>
  		<ul>
! 			<li>Tous les mots : recherche sur l'ensemble de la notice</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code � Barres : le code � barres de la bibloth�que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Type de document : s�lectionnez ici un type de document. Si aucun n'est s�lectionn�, la recherche est lanc�e sur tous les types</li>
! 			<li>Site : S�lectionnez un site pr�cis.Si vous n'en s�lectionnez aucun, la recherche se fera sur tous les sites</li>
  		</ul>
  	<p>M�thode de Recherche</p>
  		<ul>
! 			<li>Si vous renseignez plus d'un champ, votre recherche sera de type "et" (les notices contenant <b>titre</b> ET <b>auteur</b>)</li>
! 			<li>Une notice est s�lectionn�e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>Si vous saisissez un * (ou un %) � la fin d'un terme, Koha recherche les mots qui commencent par le terme saisi <b>inf�rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen�ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>Dans la partie inf�rieure de l'�cran de recherche, le pav� <b>Plus de champs</b>, vous permet de saisir ce que vous voulez  :  et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>Pour des raisons d'efficacit� l'* est active uniquement si vous entrez un mot d'au moins 3 lettres.pour les mots  de  3 lettres ou moins, l'* est ignor�e <b>ignor�</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/import breeding.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PF-5y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** breeding.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 2,13 ****
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
! <p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
! <p>Choose File to browse.</p>
! <p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract�res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 2,13 ----
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>C'est utile d'importer un paquet de notices iso2709 qui pourront �tre utilis�es plus tard pour un catalogage rapide</p>
! <p>Au pr�alable, vous devez parcourir votre ordinateur pour trouver l'enregistrement MARC que vous avez s�lectionn� pour votre document.Cliquez</p>
! <p>Choisir le dossier � rechercher.</p>
! <p>Si vous n'�tes pas s�r d'avoir d�j� import� un enregistrement laissez le button r�gl� sur</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract�res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : Cet outil n'est PAS pr�vu pour importer de l' iso2709 dans votre Base de Donn�es ACTIVE.Si vous avez besoin de migrer des donn�es � partir d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/bulkmarcimport.pl </b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/export marc.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PM-3g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/export

Modified Files:
	marc.tmpl 
Log Message:
french version for 2.2.0

Index: marc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- marc.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>iso 2709 export</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>export iso2709</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Les enregistrements sont charg�s sur le poste de travail qui a demand� l'exportation et sont sauv�s dans un fichier nomm� "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptBiblioitem.tmpl,1.3,1.4 AcceptItemCopy.tmpl,1.3,1.4 marcimportdetail.tmpl,1.3,1.4
Message-ID: <E1CmCGQ-0007Ps-Mx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/marcimport

Modified Files:
	AcceptBiblioitem.tmpl AcceptItemCopy.tmpl 
	marcimportdetail.tmpl 
Log Message:
french version for 2.2.0

Index: AcceptBiblioitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptBiblioitem.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptBiblioitem.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 8,17 ****
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d�j� dans la Base de Donn�e
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> is already in the database with  biblionumber <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
--- 8,17 ----
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d�j� dans la base de donn�es
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> est d�j� dans la base de donn�es avec le num�ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
***************
*** 26,30 ****
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" -->has been entered into the database with biblionumber  <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
--- 26,30 ----
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> a �t� saisi dans la base de donn�es avec le num�ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
***************
*** 41,45 ****
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE BARRE</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>
--- 41,45 ----
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE A BARRES</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>

Index: AcceptItemCopy.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptItemCopy.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptItemCopy.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 2,6 ****
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code Barre <b><!-- TMPL_VAR NAME="barcode" --></b> a d�j� �t� attribu�</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
--- 2,6 ----
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code � Barres <b><!-- TMPL_VAR NAME="barcode" --></b> a d�j� �t� attribu�</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
***************
*** 10,14 ****
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout� avec code barre <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>
--- 10,14 ----
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout� avec code � barres <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>

Index: marcimportdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marcimportdetail.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- marcimportdetail.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 32,36 ****
  	<tr bgcolor="#ddaaaa"><td>Ann�e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Localisation</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
--- 32,36 ----
  	<tr bgcolor="#ddaaaa"><td>Ann�e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Emplacement</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/barcodes barcodes-bottom.inc,1.1,1.2 barcodes-top.inc,1.1,1.2 barcodes.tmpl,1.1,1.2 printerConfig.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Px-Oj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/barcodes

Modified Files:
	barcodes-bottom.inc barcodes-top.inc barcodes.tmpl 
	printerConfig.tmpl 
Log Message:
french version for 2.2.0

Index: barcodes-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-bottom.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-bottom.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param�tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Bilans</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param�tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 

Index: barcodes-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-top.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-top.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 204,212 ****
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>  <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>  <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>  <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>  <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>  <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>  <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>  <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>  <a class="about" href="/cgi-bin/koha/about.pl">About</a>  <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Funds</a>  <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Auth value</a>  <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thesaurus</a>  <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Currencies</a>  <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->

--- 204,212 ----
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Accueil</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Lecteurs</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Pr�t</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit�s</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Param�tres</a> <a class="about" href="/cgi-bin/koha/about.pl">A propos</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Aide</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Cr�dits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2"> Valeurs autoris�es</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Th�saurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->


Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 41,56 ****
  

  <div id="mainbloc">

! 	<h1>G�n�rateur de code-barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G�n�rer le code barre � partir du num�ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>S�lectionner le de code-barres � g�n�rer</li>

  		<li>D�finissez la taille de la page pour le PDF</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

  		</li>

  	</ul>

--- 41,55 ----
  

  <div id="mainbloc">

! 	<h1>G�n�rateur de code � barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G�n�rer le code � barres � partir du num�ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>S�lectionnez une plage pour les num�ros d'inventaire. Vous pouvez s�lectionner une s�rie continue ou une liste de codes disjoints</li>

! 		<li>S�lectionner le style de mod�le pour g�n�rer des codes � barres</li>

  		<li>D�finissez la taille de la page pour le PDF</li>

! 		<li>Koha va afficher la disposition , qui varie suivant la taille de la page, de tous les codes � barres.Vous pouvez d�finir � quel endroit l'impression commence.

  		</li>

  	</ul>

***************
*** 117,121 ****
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code cat�gorie</td>

  						</tr>

  						<tr align="right">

--- 116,120 ----
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code Pays</td>

  						</tr>

  						<tr align="right">


Index: printerConfig.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/printerConfig.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printerConfig.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- printerConfig.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 4,8 ****
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4"> S�lectionner la configuration d'imprimante correspondant � votre environnement</font></td>

  		</tr>

  	</table>

--- 4,8 ----
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">S�lectionner la configuration d'imprimante correspondant � votre environnement</font></td>

  		</tr>

  	</table>

***************
*** 12,17 ****
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>Set margin left and margin bottom of the page that you are going to use. This parameters will

! 		    help to center the barcodes into the labels.</li>

  	</ul>

  	<br>

--- 12,16 ----
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>D�finissez les marges gauches et basses pour la page que vous souhaitez utiliser. Ces param�tres aideront � centrer les codes barres sur les �tiquettes.</li>

  	</ul>

  	<br>

***************
*** 96,100 ****
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer param�tres">

  				</td>

    			</tr>

--- 95,99 ----
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer r�glages">

  				</td>

    			</tr>





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/authorities authorities.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pi-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/authorities

Modified Files:
	authorities.tmpl searchresultlist-auth.tmpl 
	searchresultlist.tmpl 
Log Message:
french version for 2.2.0

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- authorities.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 15,19 ****
  			<input type="button" value="Ajouter une autorit�" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
- <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
  	</p>
  </div>
--- 15,18 ----
***************
*** 134,139 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 133,138 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign�(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	} else {

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist-auth.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 60,64 ****
  			<table>
  				<tr>
! 					<th class="authority">Abr�g�</th>
  					<th class="authority">Utilis�</th>
  					<th class="authority">Le choisir</th>
--- 60,64 ----
  			<table>
  				<tr>
! 					<th class="authority">R�sum�</th>
  					<th class="authority">Utilis�</th>
  					<th class="authority">Le choisir</th>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 35,39 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr�g�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
--- 35,39 ----
  		<table>
  			<tr>
! 				<th class="authority">R�sum�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
***************
*** 46,50 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title="Autorit� num�ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 46,50 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR NAME="authid" -->' title='autorit� num�ro <!-- TMPL_VAR NAME="authid" -->'>
  						</a>
  					</td>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007QW-GW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
french version for 2.2.0

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 400.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 401.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li> Cette erreur signifie que vous n'�tes pas autoris� � visualiser cette page</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que vous n'�tes pas autoris� � visualiser cette page</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 402.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 403.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 404.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 405.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a �t� rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 500.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,19 ****
  <br>
  
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
  <li>Attendez une meilleure version ou envoyez un mail � la maintenance</li>
! <li> Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,19 ----
  <br>
  
! <li>Dans Koha, ceci signifie normalement, que l'�quipe de Koha travaille � de nouvelles options</li>	
  <li>Attendez une meilleure version ou envoyez un mail � la maintenance</li>
! <li>Utilisez la barre de menu principale pour naviguer � nouveau dans Koha.</li>
  </ul>
  </div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/bull bull-home.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Q6-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/bull

Modified Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques</h1>
! 	<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  	<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques</h1>
! 	<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  	<li>Si vous voulez cr�er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,26 ****
  	<p>Cet �cran est divis� en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
  	<ul>
! 		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
! 		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
! 		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
  	<ul>
! 		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
! 		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
! 		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically</li>
! 		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically.</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
! 	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget & bookseller are defined here).</p>
! 	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,26 ----
  	<p>Cet �cran est divis� en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>La partie droite concerne les parutions.Quand vous cr�er un nouvel abonnement, le 1er num�ro est calcul�e automatiquement.Lorsque vous  voulez/ avez besoin,vous pouvez  d�finir les numeros qui ont un nouveau statut :</p>
  	<ul>
! 		<li>Arriv� : lorqu'un bulletin arrive, vous pouvez le mettre en �tat"arriv�". Le bulletin disparait de la liste et le num�ro est ajout� dans la liste des bulletins arriv�s (� gauche)</li>
! 		<li>En retard : signifie que le document est en retard et devrait �tre arriv�.Un num�ro, qui not� � l'�tat en retard reste dans la liste des bulletins attendus et le  bulletin suivant attendu est g�n�r�</li>
! 		<li>Manquant : signifie que la livraison n'aura jamais lieu.Le num�ro dispara�t de la liste et est ajout� � la liste "Liste des lacunes" (sur la partie gauche)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>Il y a 6 informations diff�rentes dans la partie gauche, qui sont calcul�es automatiquement pour la plupart, mais vous pouvez les changer<p>
  	<ul>
! 		<li>Date de d�but d'abonnement : la date de d�but du premier abonnement.Ne devrait �tre modifi�e et n'est pas modifi� automatiquement lors du renouvellement des abonnements</li>
! 		<li>date de fin d'abonnement : doit �tre entr� manuellement lorsque l'abonnement est d�finitivement clos</li>
! 		<li>Num�ros arriv�s : la liste des num�ros que vous avez dans votre biblioth�que. Automatiquement rempli quand un bulletin est marqu� arriv�. Vous pouvez modifier ce champ manuellement, par exemple pour changer une longue liste (1,2,3,4,...,51) en une plus courte(1-50)</li>
! 		<li>Num�ros manquants : la liste des  num�ros que vous n'avez pas dans votre biblioth�que, et qui n'arriveront jamais (ou qui ont �t� perdus).</li>
! 		<li>note de l'OPAC : le champ qui appara�t � l'OPAC (avec quelques autres informations sur l'abonnement comme la date de d�but et de fin).Ce champ doit �tre rempli manuellement.Rien n'est mis ici automatiquement</li>
! 		<li>Note de l'OPAC : le champ qui appara�t dans l'interface biblioth�caire (avec quelques autres informations sur l'abonnement comme la date de d�but et de fin).Ce champ doit �tre rempli manuellement.Rien n'est mis ici automatiquement</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calcule automatiquement la fin de l'abonnement (� partir de la date de d�but et du nombre d'exemplaires re�us). Lorsqu'un abonnement a pris fin, vous ne pouvez plus changer l'�tat du dernier "exemplaire en attente" (car il n'est plus attendu en fait). Pour pouvoir "recevoir" ce num�ro, vous devez renouveler votre abonnement.</p>
! 	<p>Renouveller un abonnement signifie que vous devez compl�ter quelques informations pour le renouvellement.Lorsque ces informations sont saisies, une suggestion est automatiquement cr��e dans Koha.Cette suggestion peut- �tre g�r�e par la/le biblioth�caire qui commande les livres, comme n'importe quelle autre commande (= budget et fournisseur sont d�finis ici).</p>
! 	<p><i>Noter que le renouvellement de l'abonnement fait par le biblioth�caire responsable des p�riodiques est cens� �tre imm�diat.Nous avons choisi de rendre Koha aussi simple que possible.En fait, le renouvellement de l'abonnement ne peut pas �tre imm�diat, mais nous n'avons pas voulu ajouter trop de complications.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,19 ****
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�� d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 3,19 ----
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth�caire qui a cr�� l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect�.Comporte aussi le titre de la notice concern�e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit �tre rempli : la dur�e de l'abonnement peut �tre calcul�e en semaines, mois ou nombre de num�ros � recevoir</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>Le num�ro des bulletins re�us peut �tre une formule complexe. La formule peut contenir n'importe quel texte et/ou chiffre. <b>{X} {Y}</b> et <b>{Z}</ b> sont particuliers. Vous pouvez les utiliser pour d�finir une formule de calcul. les valeurs de XYZ sont calcul�es de la mani�re suivante :</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>toutes les : le nombre avant peut �tre ajouter � chaque parution ou moins souvent</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Retourner � : si la condition pr�c�dente est valid�e, le num�ro calcul� est fix� � celui-ci � la place</li>
! 				<li>Derni�re valeur/commence avec : la derni�re valeur calcul�e ou la 1�re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 24,30 ****
  		</ul>
  		Donnera les num�ros de parution suivants
! 		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
  		<p>
! 			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 24,30 ----
  		</ul>
  		Donnera les num�ros de parution suivants
! 		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N� 2005/4, N�2006/1</p>
  		<p>
! 			<b>Note:</b>lorsque vous ajoutez un abonnement, Koha consid�re que vous avez d�j� pass� la commande o� que vous allez le faire bient�t.Aussi, AUCUNE information n'est envoy�e vers le module acquisition.Ca n'est pas le cas quand l'abonnement arive � expiration.Dans ce cas,un renouvellement de l'abonnement  cr�e une
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques d�tail</h1>
! 	In this screen, you can see subscription detail, and modify it if you need.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�� d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 1,20 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P�riodiques d�tail</h1>
! 	Sur cet �cran, vous pouvez voir le d�tail de l'abonnement, et le modifier si n�cessaire.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth�caire qui a cr�� l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect�.Comporte aussi le titre de la notice concern�e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv�e</p>
! 		<h2>Dur�e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit �tre rempli : la dur�e de l'abonnement peut �tre calcul�e en semaines, mois ou nombre de num�ros � recevoir</p>
  		<h2>Calcul de la num�rotation</h2>
! 		<p>La num�rotation des exemplaires re�us peut comprendre une formule complexe. La "Formule de num�rotation" peut �tre remplie avec n'importe quel texte et/ ou nombre.<b>{X} {Y}</b> et <b>{Z}</b> peuvent �tre utilis�es pour d�finir la formule de calcul.Les valeurs de XYZ sont calcul�es selon la mani�re suivante</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout� � XYZ</li>
! 				<li>toutes les : le nombre avant peut �tre ajouter � chaque parution ou moins souvent</li>
  				<li>Quand sup�rieur � : si le chiffre calcul� est sup�rieur � la valeur ci</li>
! 				<li>Retourner � : si la condition pr�c�dente est valid�e, le num�ro calcul� est fix� � celui-ci � la place</li>
! 				<li>Derni�re valeur/commence avec : la derni�re valeur calcul�e ou la 1�re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 23,27 ****
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup�rieur � <b>4</b> Retourner � <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num�ros de parution suivants
! 			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
  		<p>
  		</p>
--- 23,27 ----
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup�rieur � <b>4</b> Retourner � <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num�ros de parution suivants
! 			<b>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N� 2005/4, N�2006/1
  		<p>
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio.tmpl,1.12,1.13 addbooks.tmpl,1.5,1.6 additem-nomarc.tmpl,1.3,1.4 additem.tmpl,1.8,1.9 isbnsearch.tmpl,1.4,1.5 marcimport.tmpl,1.4,1.5
Message-ID: <E1CmCGR-0007QJ-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui.simple

Modified Files:
	addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl 
	isbnsearch.tmpl marcimport.tmpl 
Log Message:
french version for 2.2.0

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** addbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.12
--- addbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.13
***************
*** 57,61 ****
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate"> Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice � nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> � partir de cette notice</p>
  				</ul>
--- 57,61 ----
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice � nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> � partir de cette notice</p>
  				</ul>
***************
*** 455,460 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 455,460 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign�(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	} else {

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** addbooks.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- addbooks.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 1,5 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv�(s)</font>
--- 1,5 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv�(s)</font>
***************
*** 11,21 ****
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="acquisition"> Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button acquisition"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button acquisition">Cr�er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
--- 11,21 ----
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="catalogue">Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button catalogue"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Cr�er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
***************
*** 27,40 ****
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr�er une nouvelle notice" class="button acquisition">
! 				</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="acquisition">Optimisation</h2>
! 		<p>If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.<br/>
! 				If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.<br/>
! 				Sinon, une notice peut-�tre ajout� � partir de z�ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 27,41 ----
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr�er une nouvelle notice" class="button catalogue">
! 				</form>
! 			</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Optimisation</h2>
! 		<p>Si l'ISBN ou le titre est trouv� dans la table il peut �tre r�cup�r� puis modifi�<br/>
! 				Si l'ISBN ou le titre est trouv� dans le r�servoir, il sera r�cup�r� et une notice sera rajout�e<br/>
! 				Sinon, une notice peut-�tre ajout�e en partant de z�ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem-nomarc.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- additem-nomarc.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code barre � l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code � barres � l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D�sol�, ce code barre est d�j� utilis�</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D�sol�, ce code � barres est d�j� utilis�</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
***************
*** 29,33 ****
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Localisation</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
--- 29,33 ----
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Emplacement</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
***************
*** 44,48 ****
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code Barre de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>
--- 44,48 ----
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code � Barres de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** additem.tmpl	24 Nov 2004 16:11:16 -0000	1.8
--- additem.tmpl	5 Jan 2005 14:35:18 -0000	1.9
***************
*** 46,53 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code barre d�j� utilis�!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un ouvrage" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
--- 46,53 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code � barres d�j� utilis�!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un document" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
***************
*** 95,99 ****
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	}
--- 95,99 ----
  		alertString2  = _("Formulaire non soumis � cause du (des) probl�me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("champs obligatoires non renseign�s (voir les champs en caract�re gras)");
  		alert(alertString2);
  	}
***************
*** 104,108 ****
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l'ouvrage ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
--- 104,108 ----
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l exemplaire ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** isbnsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- isbnsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 1,7 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">R�sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="acquisition">Vous recherchiez <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></b></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r�ponses</p>
--- 1,7 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">R�sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="catalogue">Vous recherchiez <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r�ponses</p>
***************
*** 10,20 ****
  	</div>
  	<div id="bloc100">
! 		<h2 class="acquisition">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="acquisition">Titre</th>
! 				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">&copier;</th>
! 				<th class="acquisition">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
--- 10,20 ----
  	</div>
  	<div id="bloc100">
! 		<h2 class="catalogue">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="catalogue">Titre</th>
! 				<th class="catalogue">Auteur</th>
! 				<th class="catalogue">&copier;</th>
! 				<th class="catalogue">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
***************
*** 25,31 ****
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ajouter des ouvrages</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
--- 25,31 ----
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ajouter des documents</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
***************
*** 61,65 ****
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="acquisition">Notices dans le r�servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 61,65 ----
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="catalogue">Notices dans le r�servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 91,97 ****
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
--- 91,103 ----
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<select name="frameworkcode">
! 				<option value="">Par d�faut</option>
! 				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
! 					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
! 				<!-- /TMPL_LOOP -->
! 			</select>
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 99,101 ****
  	
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 105,107 ----
  	
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** marcimport.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- marcimport.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 12,18 ****
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�e</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
--- 12,18 ----
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import�s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import� parce que d�j� dans la base de donn�es</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import�,parce que d�j� dans le r�servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import� parce qu'ils ne semblent pas �tre au format MARC (ou n� ISBN/ ISSN manquant) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait�s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
***************
*** 20,27 ****
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 	<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 	<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 20,27 ----
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>S�lectionner un fichier � importer dans le r�servoir.Il sera analys�, et pour chaque ISBN trouv�, une nouvelle copie sera cr�� dans le r�servoir.</li>
! 	<li>Si un ISBN existe d�j� dans le r�servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'�craser l'ancien.</li>
! 	<li>Vous pouvez donner un nom � cette importation. Cela peut �tre utile, lors de la cr�ation d'une notice, pour vous souvenir d'o� vient l'enregistrement MARC propos�!</li>
! 	<li>Bien s�r, si l'ISBN existe d�j� dans la base de donn�es, la notice sera ignor�e.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bull receipt-search-result.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2 serial-issues.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2 subscription-renew.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Qg-MN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bull

Modified Files:
	receipt-search-result.tmpl result.tmpl search.tmpl 
	searchresultlist.tmpl serial-issues.tmpl statecollection.tmpl 
	subscription-add.tmpl subscription-detail.tmpl 
	subscription-renew.tmpl 
Log Message:
french version for 2.2.0

Index: receipt-search-result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/receipt-search-result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** receipt-search-result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- receipt-search-result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 36,40 ****
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title='Num�ro du p�riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>
--- 36,40 ----
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR name="authid" -->' title='Num�ro du p�riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 			<th class="catalogue">Abr�g�</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
--- 31,35 ----
  		<table>
  			<tr>
! 			<th class="catalogue">R�sum�</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
***************
*** 48,56 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- 					<!-- TMPL_UNLESS NAME="norequests" -->
  						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Le choisir</a>
- 					<!-- TMPL_ELSE -->
- 						Non R�servable
- 					<!-- /TMPL_UNLESS -->
  				</td>
  			</tr>
--- 48,52 ----

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 11,15 ****
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Mot cl�</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 11,15 ----
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Tous les mots</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr�g�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
--- 31,35 ----
  		<table>
  			<tr>
! 				<th class="authority">R�sum�</th>
  				<th class="authority">Utilis�</th>
  				<th class="authority">Voir</th>
***************
*** 42,46 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit� num�ro <!--TMPL_VAR" title="Autorit� num�ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 42,46 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit� num�ro <!-- TMPL_VAR name="authid" -->' title='Autorit� num�ro <!-- TMPL_VAR name="authid" -->'>
  						</a>
  					</td>

Index: serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** serial-issues.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- serial-issues.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 68,72 ****
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> pr�ts<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->
--- 68,72 ----
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> sorties<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 3,32 ****
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour</h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
- 	<h2 class="bull">R�sum� d'abonnement</h2>
- 	<form method="post" name="f" action="statecollection.pl">
- 		<input type="hidden" name="op" value="modsubscriptionhistory">
- 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
- 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
- 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
- 		<p><label>Biblioth�caire</label><!-- TMPL_VAR name="user" --></p>
- 		<p><label>Date de d�but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
- 		<p><label>Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
- 		<p>N� Arriv�s</p>
- 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
- 		<p>Num�ros enregistr�s</p>
- 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
- 		<p>Remarque de l'OPAC</p>
- 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
- 		<p>Note interne</p>
- 		<p>&nbsp;<textarea name="librariannote" COLS=60 ROWS=5><!-- TMPL_VAR name="librariannote" --></textarea></p>
- 		<input type="submit" value="Enregistrer les changements" class="button bull">
- 	</form>
- </div>
- 
- <div id="bloc25">
  <h2 class="bull">Num�ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
--- 3,10 ----
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
  <h2 class="bull">Num�ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
***************
*** 83,92 ****
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="button bull">Renew</a> your subscription</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! </form>
  </table>
  <script language="JavaScript" type="text/javascript">
--- 61,89 ----
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>L'abonnement a expir�.L'�tat du prochain numero attendu ne peut-�tre chang�. <a href="#" onClick="popup()" class="button bull">Renouveller</a>votre abonnement</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! <div id="bloc25">
! 	<h2 class="bull">R�sum� d'abonnement</h2>
! 	<form method="post" name="f" action="statecollection.pl">
! 		<input type="hidden" name="op" value="modsubscriptionhistory">
! 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
! 		<p><label>Biblioth�caire</label><!-- TMPL_VAR name="user" --></p>
! 		<p><label class="label100">Date de d�but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
! 		<p><label class="label100">Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
! 		<p>Bulletins re�us</p>
! 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
! 		<p>Bulletins manquants</p>
! 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
! 		<p>Remarque de l'OPAC</p>
! 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
! 		<input type="submit" value="Enregistrer les changements" class="button bull">
! 	</form>
! </div>
! 
  </table>
  <script language="JavaScript" type="text/javascript">

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 21,26 ****
  		<p class="problem">attention</p>
  		<ul>
! 			<li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
! 			<li>You also must have selected a supplier if you want to ask for late issues</li>
  		</ul>
  </div>
--- 21,26 ----
  		<p class="problem">attention</p>
  		<ul>
! 			<li>Souvenez vous que vous <b>devez</b> avoir cr�� une notice <b>avant</b> de cr�er un abonnement</li>
! 			<li>Vous devez s�lectionner un fournisseur si vous souhaitez r�clamer les num�ros en retard</li>
  		</ul>
  </div>
***************
*** 129,133 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�� d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>
--- 129,133 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�e d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 76,80 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�� d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>
--- 76,80 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur�e d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-renew.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 13,17 ****
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p> Remarque pour le biblioth�caire qui va g�rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">
--- 13,17 ----
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Remarque pour le biblioth�caire qui va g�rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members jmemberentry.tmpl,1.9,1.10 member-flags.tmpl,1.2,1.3 member-password.tmpl,1.5,1.6 member.tmpl,1.10,1.11 memberentry.tmpl,1.12,1.13 members-home.tmpl,1.7,1.8 moremember.tmpl,1.16,1.17 newjmember.tmpl,1.2,1.3 newmember.tmpl,1.2,1.3 readingrec.tmpl,1.5,1.6
Message-ID: <E1CmCGS-0007Qu-35@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/members

Modified Files:
	jmemberentry.tmpl member-flags.tmpl member-password.tmpl 
	member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl 
	newjmember.tmpl newmember.tmpl readingrec.tmpl 
Log Message:
french version for 2.2.0

Index: jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** jmemberentry.tmpl	24 Nov 2004 16:17:14 -0000	1.9
--- jmemberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.10
***************
*** 74,78 ****
  		</tr>
  		<tr>
! 			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
  		<tr>
  			<td>Champ de tri 1</td>
--- 74,78 ----
  		</tr>
  		<tr>
! 			<td colspan="5">Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent �tre utiles pour des besoins statistiques.</td>
  		<tr>
  			<td>Champ de tri 1</td>

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- member-flags.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations</div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>
--- 2,6 ----
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations pour <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member-password.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- member-password.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 7,11 ****
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				You have entered a UserID that already exists.  Please choose another one.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
--- 7,11 ----
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				Vous avez saisi un nom d'utilisateur qui existe d�j�. Merci de choisir un autre nom.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** member.tmpl	24 Nov 2004 16:17:14 -0000	1.10
--- member.tmpl	5 Jan 2005 14:35:21 -0000	1.11
***************
*** 43,47 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 43,47 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** memberentry.tmpl	15 Dec 2004 22:11:52 -0000	1.12
--- memberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.13
***************
*** 2,129 ****
  
  <div id="mainbloc">
!  <!-- TMPL_IF NAME="addAction" -->
!  <h1>
!   Ajouter une inscription
!  </h1>
!  <!-- TMPL_ELSE -->
!  <h1>
!   Mettre � jour les d�tails-lecteur
!  </h1>
!  <!-- /TMPL_IF -->
! 
!  <!-- TMPL_IF Name="NOK" -->
!   <h1>ERREUR</h1>
!   <div id="problem">
!    <p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK � nouveau :</p>
!    <!-- TMPL_IF NAME="ERROR_cardnumber" -->
!     Num�ro de Carte<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
!     N� de carte invalide<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_gender" -->
!     Sexe<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_firstname" -->
!     Pr�noms<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_surname" -->
!     Nom de famille<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="aERROR_ddress" -->
!     Rue de l'adresse<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_city" -->
!     Ville (Code Postal)<br>
!    <!-- /TMPL_IF -->
!   </div>
!  <!-- /TMPL_IF -->
!  <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
!   <input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
!   <input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
!   <input type="hidden" name="type" value="borrowers">
!   <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
!   <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
!   <!-- TMPL_IF NAME="addAction" -->
!    <input type="hidden" name="op" value="add">
!   <!-- TMPL_ELSE -->
!    <input type="hidden" name="op" value="modify">
!   <!-- /TMPL_IF -->
!   <table>
!    <tr>
!     <td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num�ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
!    </tr>
!    <tr>
!     <th colspan="5">DETAILS PERSONNELS DU LECTEUR</th>
!    </tr>
!    <tr>
!     <td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" --><b> Pr�noms</b><!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit�</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Nom pr�f�rentiel<!-- /TMPL_UNLESS --></td>
!    </tr>
!    <tr>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!     <!-- TMPL_VAR NAME="Mr" -->
!     <select name="title">
!      <option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
!      <option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
!      <option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
!      <option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
!      <option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
!      <option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
!      <option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
!     </select>
!     <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!    </tr>
! 
!    <tr>
!     <td colspan="2">
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
!     <!-- /TMPL_UNLESS -->
! 
!     </td>
!     <td colspan="2">
!      <!-- TMPL_UNLESS name="institution" -->
!      Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      Cat�gorie  <!-- TMPL_VAR NAME="catcodepopup" -->
!     </td>
!    </tr>
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <!-- TMPL_VAR NAME="ethcatpopup" -->
!      <td colspan="2">Ethnie</td>
!      <td colspan="2">Note d'ethnie</td>
!     </tr>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <td colspan="2">
!       <!-- TMPL_IF NAME="ethcatpopup" -->
!        <select name="ethnicity" size="1">
!         <!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
--- 2,129 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_IF NAME="addAction" -->
! 	<h1>
! 		Ajouter <!-- TMPL_IF NAME="institution" -->Nom de la Collectivit� <!-- /TMPL_IF -->Lecteur
! 	</h1>
! 	<!-- TMPL_ELSE -->
! 	<h1>
! 		Mettre � jour les d�tails-lecteur
! 	</h1>
! 	<!-- /TMPL_IF -->
! 
! 	<!-- TMPL_IF Name="NOK" -->
! 		<h1>ERREUR</h1>
! 		<div id="problem">
! 			<p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK � nouveau :</p>
! 			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
! 				Num�ro de Carte<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
! 				N� de carte invalide<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_gender" -->
! 				Sexe<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_firstname" -->
! 				Pr�noms<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_surname" -->
! 				Nom de famille<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="aERROR_ddress" -->
! 				Rue de l'adresse<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_city" -->
! 				Ville (Code Postal)<br>
! 			<!-- /TMPL_IF -->
! 		</div>
! 	<!-- /TMPL_IF -->
! 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
! 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
! 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
! 		<input type="hidden" name="type" value="borrowers">
! 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
! 		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
! 		<!-- TMPL_IF NAME="addAction" -->
! 			<input type="hidden" name="op" value="add">
! 		<!-- TMPL_ELSE -->
! 			<input type="hidden" name="op" value="modify">
! 		<!-- /TMPL_IF -->
! 		<table>
! 			<tr>
! 				<td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num�ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
! 			</tr>
! 			<tr>
! 				<th colspan="5">NOUVEAU LECTEUR <!-- TMPL_UNLESS name="institution" -->DETAILS PERSONNELS<!-- /TMPL_UNLESS --> DETAILS DU CONTACT</th>
! 			</tr>
! 			<tr>
! 				<td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" --><b> Pr�noms</b><!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit�</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Nom usuel<!-- /TMPL_UNLESS --></td>
! 			</tr>
! 			<tr>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 				<!-- TMPL_VAR NAME="Mr" -->
! 				<select name="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
! 					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
! 					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
! 					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
! 					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
! 					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
! 					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
! 				</select>
! 				<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td colspan="2">
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
! 				<!-- /TMPL_UNLESS -->
! 
! 				</td>
! 				<td colspan="2">
! 					<!-- TMPL_UNLESS name="institution" -->
! 					Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					Categorie <!-- TMPL_VAR NAME="catcodepopup" -->
! 				</td>
! 			</tr>
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<!-- TMPL_VAR NAME="ethcatpopup" -->
! 					<td colspan="2">Ethnie</td>
! 					<td colspan="2">Note d'ethnie</td>
! 				</tr>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<td colspan="2">
! 						<!-- TMPL_IF NAME="ethcatpopup" -->
! 							<select name="ethnicity" size="1">
! 								<!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
***************
*** 164,168 ****
  
  			<tr>
! 				<td colspan="2">Adresse municipale, si diff�rente</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
--- 164,168 ----
  
  			<tr>
! 				<td colspan="2">Autre adresse</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
***************
*** 208,212 ****
  
  			<tr>
! 				<td colspan="3">Full Name</td>
  				<td>T�l�phone</td>
  					<td>Relation</td>
--- 208,212 ----
  
  			<tr>
! 				<td colspan="3">Nom</td>
  				<td>T�l�phone</td>
  					<td>Relation</td>
***************
*** 239,243 ****
  			</tr>
  			<tr>
! 				<td>Note de circulation (appara�t durant le pr�t/retour)</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
--- 239,243 ----
  			</tr>
  			<tr>
! 				<td>Note de pr�t (appara�t pendant les sortie/retour</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
***************
*** 258,276 ****
  				<td>Champ de tri 1</td>
  				<td colspan="4">
!      <input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
!     </td>
!    </tr>
!    <tr>
!     <td>Champ de tri 2</td>
!     <td colspan="4">
!      <input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
!     </td>
!    </tr>
! 
!    <tr>
!     <td></td>
!     <td>
!      <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
!      <input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>
--- 258,276 ----
  				<td>Champ de tri 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 				</td>
! 			</tr>
! 			<tr>
! 				<td>Champ de tri 2</td>
! 				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td></td>
! 				<td>
! 					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
! 					<input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>

Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** members-home.tmpl	24 Nov 2004 16:17:14 -0000	1.7
--- members-home.tmpl	5 Jan 2005 14:35:21 -0000	1.8
***************
*** 8,17 ****
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
! 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Parcourir les Membres</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
--- 8,17 ----
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Prolonger des pr�ts, visualiser,ajouter, modifier, supprimer des enregistrements,tout cela en commen�ant par cette recherche</p>
! 		<p>Saisissez le nom du lecteur, une partie du nom, ou un code num�rique dans le champ ci-dessus et appuyez sur la touche Entr�e pour lancer la recherche</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Naviguer dans les lecteurs</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** moremember.tmpl	24 Nov 2004 16:17:14 -0000	1.16
--- moremember.tmpl	5 Jan 2005 14:35:21 -0000	1.17
***************
*** 8,12 ****
  		<p>Num�ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" -->: ,  <br>
  		T�l�phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T�l�phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
--- 8,12 ----
  		<p>Num�ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		T�l�phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T�l�phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
***************
*** 26,30 ****
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe<br>
  			Autre
  		<!-- /TMPL_UNLESS -->
--- 26,30 ----
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe <!-- TMPL_VAR NAME="sex" --><br>
  			Autre
  		<!-- /TMPL_UNLESS -->
***************
*** 165,169 ****
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Droits de pr�t</th>
  				<th>Renouvellement</th>
  			</tr>
--- 165,169 ----
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Frais</th>
  				<th>Renouvellement</th>
  			</tr>

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newjmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newjmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 		<!-- TMPL_VAR NAME="string" -->
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
--- 2,13 ----
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 	<h3>Les champs suivants sont incorrects. Cliquez sur "retour" et corrigez les.</h3>
! 	<ul>
! 		<!-- TMPL_IF NAME="cardnumber_missing" --><li>Merci d'entrer le num�ro de carte lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="firstname_missing" --><li>Merci d'entrer le nom du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="surname_missing" --><li>Merci d'entrer le pr�nom du lecteur.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="dob_missing" --><li>Merci de saisir la date de naissance du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gender_missing" --><li>Merci d'entrer le sexe du lecteur.</li><!-- /TMPL_IF -->
! 	</ul>
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
***************
*** 42,45 ****
--- 49,60 ----
  					<tr valign="top" bgcolor="white" >
  						<td>
+ 						<b>Barcode Number</b>
+ 						</td>
+ 						<td>
+ 						<!-- TMPL_VAR NAME="cardchild" -->
+ 						</td>
+ 					</tr>					
+ 					<tr valign="top" bgcolor="white" >
+ 						<td>
  						<b>Date de naissance</b>
  						</td>

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 228,232 ****
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num�ro de Carte<br/>
--- 228,232 ----
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>Les champs suivants ont des valeurs interdites. Merci de cliquer sur le bouton retour et de r�essayer : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num�ro de Carte<br/>

Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** readingrec.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- readingrec.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  	
  	<!-- TMPL_IF NAME="showfulllink" -->
+ 	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Voir les 50 derniers seulement</a></p><!-- TMPL_ELSE -->
  	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Sortie compl�te</a></p>
  	<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.5,1.6 acquire.tmpl,1.3,1.4 basket.tmpl,1.7,1.8 histsearch.tmpl,1.1,1.2 newbasket2.tmpl,1.6,1.7 newbiblio.tmpl,1.7,1.8 recieve.tmpl,1.3,1.4 suggestion-select.tmpl,1.1,1.2 supplier.tmpl,1.6,1.7
Message-ID: <E1CmCGR-0007Qk-OI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl histsearch.tmpl 
	newbasket2.tmpl newbiblio.tmpl recieve.tmpl 
	suggestion-select.tmpl supplier.tmpl 
Log Message:
french version for 2.2.0

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acqui-home.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- acqui-home.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 39,43 ****
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets</h2>
  		<table class="noborder">
  			<tr>
--- 39,43 ----
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets et lignes de cr�dit</h2>
  		<table class="noborder">
  			<tr>
***************
*** 66,70 ****
  		</table>
  		<p>
! 		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
  	</form>
--- 66,70 ----
  		</table>
  		<p>
! 		Utilisez le bouton rafra�chir pour avoir les chiffres les plus r�cents.Les chiffres communiqu�s le sont � titre indicatif, dans la mesure o� des taux de change affecteront le montant r�ellement pay�.
  		</p>
  	</form>
***************
*** 74,81 ****
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</p>
! 		<p>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </p>
! 		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.</p>
! 		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
  	</ul>
  </div>
--- 74,81 ----
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>Pour d�buter une acquisition, que �a soit une commande, un achat direct ou un don, rechercher tout d'abord le fournisseur, Ajoutez en un si n�cessaire.</p>
! 		<p>Puis s�lectionnez un panier d'achat pr�c�dent ou cr�ez en un nouveau. Notez que le panier d'achat sera attach� � l'utilisateur sous lequel vous �tes logg�. </p>
! 		<p>Pour commander un document vous avez besoin de d�terminer si une notice existe d�j�, puis soit ajouter un exemplaire, soit cr�er une nouvelle notice et y ajouter l'exemplaire</p>
! 		<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez en dessus, et cliquez alors sur "confirmer le panier".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acquire.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- acquire.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 35,39 ****
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p> Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
--- 35,39 ----
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p>Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
***************
*** 41,45 ****
  			</p>
  			<p>
! 				<label class="label100">Code Barre de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
--- 41,45 ----
  			</p>
  			<p>
! 				<label class="label100">Code � Barres de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
***************
*** 48,52 ****
  			<h2 class="acquisition">D�tails de comptabilit�</h2>
  			<p>
! 				<label class="label100">Budget</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
--- 48,52 ----
  			<h2 class="acquisition">D�tails de comptabilit�</h2>
  			<p>
! 				<label class="label100">Ligne de cr�dit</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
***************
*** 70,74 ****
  			<p>
  				<label class="label100">Co�t r�el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
  			</p>
  			<p>
--- 70,74 ----
  			<p>
  				<label class="label100">Co�t r�el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
  			</p>
  			<p>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** basket.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- basket.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 28,32 ****
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">rrp</th>
  				<th class="acquisition">estim�</th>
  				<th class="acquisition">QT�</th>
--- 28,32 ----
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">HT</th>
  				<th class="acquisition">estim�</th>
  				<th class="acquisition">QT�</th>
***************
*** 39,43 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
--- 39,47 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
! 					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- histsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Ordre des r�ponses</h1>
  	<table>
  		<tr>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Recherche sur les commandes</h1>
  	<table>
  		<tr>

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbasket2.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- newbasket2.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat pour <!-- TMPL_VAR name="basketno" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat <!-- TMPL_VAR name="basketno" --> pour <!-- TMPL_VAR NAME="bookselname" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- newbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 74,78 ****
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp�cifier � partir d'une suggestion<!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
--- 74,78 ----
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp�cifi� � partir de la suggestion #<!-- TMPL_VAR NAME="suggestionid" --><!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
***************
*** 81,97 ****
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<input type="text" size="30" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" >
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
  		</p>
  		<p>
--- 81,113 ----
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 101,109 ****
  		<p>
  			<label class="label100">ISBN</label>
! 			<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
  		</p>
  		<p>
  			<label class="label100">P�riodique</label>
! 			<input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
  		</p>
  		<p>
--- 117,133 ----
  		<p>
  			<label class="label100">ISBN</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">P�riodique</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 119,123 ****
  		</p>
  		<p>
! 			<label class="label100">Budget</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Ligne de cr�dit</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
***************
*** 153,157 ****
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>
--- 177,181 ----
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent �tre utiles pour des besoins statistiques.</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieve.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- recieve.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 66,70 ****
  			<b>AIDE</b>
  			<br>
! 			The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>
--- 66,70 ----
  			<b>AIDE</b>
  			<br>
! 			Le total en bas de la page devra �tre proche de quelques centimes du total de la facture.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>

Index: suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/suggestion-select.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** suggestion-select.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- suggestion-select.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 30,34 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
--- 30,34 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann�e de copyright <!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** supplier.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- supplier.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 104,108 ****
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des ouvrages incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>
--- 104,108 ----
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des documents incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/barcodes - New directory
Message-ID: <E1CmCHf-0007Xx-MQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/barcodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/authorities - New directory
Message-ID: <E1CmCHf-0007Xu-LB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/help - New directory
Message-ID: <E1CmCHg-0007YJ-4i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bookshelves - New directory
Message-ID: <E1CmCHf-0007Y1-QF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bookshelves

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/suggestion - New directory
Message-ID: <E1CmCHg-0007YV-6z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/z3950 - New directory
Message-ID: <E1CmCHg-0007YY-9e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/z3950

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950 added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/errors - New directory
Message-ID: <E1CmCHf-0007YB-Vd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bull - New directory
Message-ID: <E1CmCHf-0007Y5-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/import - New directory
Message-ID: <E1CmCHg-0007YR-5p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/import

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:41:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:41:53 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.5,1.6 default_intranet_fr_FR.po,1.4,1.5
Message-ID: <E1CmCMD-0007mZ-T4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29858/misc/translator/po

Modified Files:
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** css_opac_fr_FR.po	8 Dec 2004 10:36:03 -0000	1.5
--- css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
***************
*** 36,40 ****
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s livres)"
  
  #. %1$s: TMPL_VAR name=title 
--- 36,40 ----
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s documents)"
  
  #. %1$s: TMPL_VAR name=title 
***************
*** 49,53 ****
  #, c-format
  msgid "%s (hm)"
! msgstr "%s (maison)"
  
  #. For the first occurrence, 
--- 49,53 ----
  #, c-format
  msgid "%s (hm)"
! msgstr "%s(domicile)"
  
  #. For the first occurrence, 
***************
*** 110,114 ****
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s livres)"
  
  #. %1$s: TMPL_VAR name=author 
--- 110,114 ----
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s documents)"
  
  #. %1$s: TMPL_VAR name=author 
***************
*** 145,149 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "<<Pr�d�cent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
--- 145,149 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "Pr�c�dent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
***************
*** 266,270 ****
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour avoir des fonctionnalit�s personnelles"
  
  #. %1$s: TMPL_VAR name=issues 
--- 266,270 ----
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour acc�der � votre dossier personnel"
  
  #. %1$s: TMPL_VAR name=issues 
***************
*** 272,276 ****
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 272,276 ----
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Total des pr�ts:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 278,282 ****
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Autre auteur :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 278,282 ----
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Auteur secondaire :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 284,288 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Autres auteurs :</b>%s"
  
  #. For the first occurrence, 
--- 284,289 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
***************
*** 340,344 ****
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
--- 341,345 ----
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Site actuel :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
***************
*** 346,350 ****
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
--- 347,351 ----
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Date de publication :</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
***************
*** 370,374 ****
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
--- 371,375 ----
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "</b> %s'><b>Site d'origine:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
***************
*** 390,394 ****
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 391,395 ----
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Illus:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 402,406 ****
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b>Type de document : </b>%s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 403,407 ----
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b> Document perdu :</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 422,426 ****
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=card1 
--- 423,427 ----
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Dernier emprunteur 1:</b> %s "
  
  #. %1$s: TMPL_VAR name=card1 
***************
*** 428,432 ****
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=timestamp0 
--- 429,433 ----
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Dernier emprunteur 2:</b> %s "
  
  #. %1$s: TMPL_VAR name=timestamp0 
***************
*** 434,438 ****
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=datelastseen 
--- 435,439 ----
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Dernier emprunteur :</b> %s "
  
  #. %1$s: TMPL_VAR name=datelastseen 
***************
*** 440,444 ****
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
--- 441,445 ----
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Vu le :</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
***************
*** 446,450 ****
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
--- 447,451 ----
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Dur�e du pr�t:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
***************
*** 452,456 ****
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. For the first occurrence, 
--- 453,457 ----
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "</b> %s'><b>Nbre. d'exemplaires:</b> %s"
  
  #. For the first occurrence, 
***************
*** 468,472 ****
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
--- 469,473 ----
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Pages:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
***************
*** 474,478 ****
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
--- 475,479 ----
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Pay� pour:</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
***************
*** 480,484 ****
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
--- 481,485 ----
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Emplacement:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
***************
*** 492,496 ****
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>publi� par :</b>%s"
  
  #. %1$s: TMPL_VAR name=renewals 
--- 493,497 ----
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>Editeur:</b> %s"
  
  #. %1$s: TMPL_VAR name=renewals 
***************
*** 498,502 ****
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
--- 499,503 ----
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Renouvellements:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
***************
*** 504,508 ****
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
--- 505,509 ----
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Frais de location:</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
***************
*** 510,514 ****
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Collection:</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
--- 511,515 ----
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Prix de Remplacement :</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
***************
*** 516,520 ****
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Serial:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
--- 517,521 ----
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Colection:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
***************
*** 741,745 ****
  #, c-format
  msgid "BARCODE %s"
! msgstr "code barre %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
--- 742,746 ----
  #, c-format
  msgid "BARCODE %s"
! msgstr "CODE A BARRES %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
***************
*** 751,760 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour � la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "code barre"
  
  #. SCRIPT 
--- 752,761 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour � la notice"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "Code � barres"
  
  #. SCRIPT 
***************
*** 772,788 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de Biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Rayons"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Annexe"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Annexes"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
--- 773,789 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Etag�res"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Site"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Sites"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
***************
*** 959,963 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filter sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 960,964 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filtrer sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Aide"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
--- 987,991 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Conseils"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
***************
*** 1019,1023 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % � la fin du mot. Par exemple, \"deux tours\" retournera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1020,1024 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % � la fin du mot. Par exemple, \"deux tours\" donnera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1035,1039 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Bulletins"
  
  #. %1$s: TMPL_VAR name=startdate 
--- 1036,1040 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Abr�g� des num�ros"
  
  #. %1$s: TMPL_VAR name=startdate 
***************
*** 1041,1066 ****
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D�butant le <b>%s</b> et un num�ro chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
--- 1042,1067 ----
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D�butant le <b>%s</b> et paraissant chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Exemplaire"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre d'exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "Code � barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "Exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
***************
*** 1344,1348 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "ann�e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
--- 1345,1349 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "Ann�e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
***************
*** 1375,1379 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Command� par la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
--- 1376,1380 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Re�u par la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
***************
*** 1475,1479 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S�lectionnez une annexe si vous voulez limiter votre recherche � une annexe sp�cifique. Par d�faut, la recherche sera faite sur toutes les annexes de la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
--- 1476,1480 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S�lectionnez une annexe si vous voulez limiter votre recherche � un site ne particulier. Par d�faut, la recherche sera faite sur tous les sites de la biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
***************
*** 1523,1527 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D�sol�, Koha ne pense pas que vous pouvez acc�der � cette page"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
--- 1524,1528 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D�sol�, Koha pense que vous ne pouvez pas acc�der � cette page."
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
***************
*** 1577,1581 ****
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information de souscription pour %s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
--- 1578,1582 ----
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information d'abonnement pour%s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
***************
*** 1599,1603 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
--- 1600,1604 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
***************
*** 1702,1706 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
--- 1703,1707 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Voir et g�rer les suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
***************
*** 1777,1781 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou un mot de document invalide, merci de r�essayer"
  
  #. %1$s: TMPL_VAR name=issues_count 
--- 1778,1782 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou mot de passe invalide, merci de r�essayer."
  
  #. %1$s: TMPL_VAR name=issues_count 
***************
*** 1827,1831 ****
  #
  msgid "Your biblio basket"
! msgstr "Panier de Biblioth�que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1828,1832 ----
  #
  msgid "Your biblio basket"
! msgstr "Votre panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1845,1849 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
--- 1846,1850 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code � barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** default_intranet_fr_FR.po	8 Dec 2004 10:36:04 -0000	1.4
--- default_intranet_fr_FR.po	5 Jan 2005 14:41:50 -0000	1.5
***************
*** 1,10449 ****
  # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
! "PO-Revision-Date: 2004-11-24 15:06+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
[...22711 lines suppressed...]
  
! #. SCRIPT
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:54
  msgid "word missing"
  msgstr "mot manquant"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
  msgstr "ann�e"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
  msgid "z3950 search"
  msgstr "Recherche Z39.50"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
! msgid ""
! "|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. "
! "200i}{ / 200f}{ ; 200g}|"
  msgstr ""
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:42:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:42:13 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,1.1,1.2
Message-ID: <E1CmCMX-0007o6-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29975/misc/translator

Modified Files:
	rebuild_lang.sh 
Log Message:


Index: rebuild_lang.sh
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/rebuild_lang.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** rebuild_lang.sh	3 Jan 2005 16:30:13 -0000	1.1
--- rebuild_lang.sh	5 Jan 2005 14:42:03 -0000	1.2
***************
*** 3,9 ****
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW
  
! ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR
--- 3,9 ----
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/zh-TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh-TW
  
! # ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es




From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig - New directory
Message-ID: <E1CmDLr-0002Zv-KQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/labelConfig

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes - New directory
Message-ID: <E1CmDLr-0002Zs-JV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/countryCodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-barcodes-close.inc,NONE,1.1
Message-ID: <E1CmDLW-0002YW-Ia@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9811/koha-tmpl/intranet-tmpl/npl/en/includes

Added Files:
	doc-head-barcodes-close.inc 
Log Message:
Required for barcode generator

--- NEW FILE ---
</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
<style type="text/css"> 
	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
</style>
<style>
.parameters {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
a.parameters:hover {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
.ranges {
	border:0;
}

.myTable TD{
  border-width: 0px;
  border-color: navy;
  border-style: solid;
}

.panel { 
	position:relative;
}

.countryPanel {
	z-index:1;
	width:300px;
	display:none;
	border:1px solid #000000;
	padding:0px;
}
</style>


<script type="text/javascript">
	// Captura el evento onmousemove para cualquier navegador
	if (document.layers) { // Netscape
		document.captureEvents(Event.MOUSEMOVE);
	    document.onmousemove = captureMousePosition;
	} else if (document.all) { // Internet Explorer
	    document.onmousemove = captureMousePosition;
	} else if (document.getElementById) { // Netcsape 6
	    document.onmousemove = captureMousePosition;
	}

	var mouseXMax = 0;
	var mouseYMax = 0;
	var mouseX = 0;
	var mouseY = 0;

	function captureMousePosition(e) {
	    if (document.layers) {
		    mouseX = e.pageX;
			mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
		    mouseYMax = window.innerHeight + window.pageYOffset;
	    } else if (document.all) {
		    mouseX = window.event.x + document.body.scrollLeft;
	        mouseY = window.event.y + document.body.scrollTop;
	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
	    } else if (document.getElementById) {
	        mouseX = e.pageX;
		    mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
	        mouseYMax = window.innerHeight + window.pageYOffset;
	    }
	}

/* Devuelve true si el explorador es Internet Explorer */
var IE = document.all?true:false;

function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}

function correctRange (from, to) {
	if (from <= to) {
		return true;
	} else {
		return false;
	}
}

function emptyField (field) {
	if ((field == null) || (field == "")) {
		return true;
	} else {
		return false;
	}
}

function checkFields (aForm) {
  var option = document.getElementById('rangeType').value;
  if (option == 'continuous' || option == 'continuous2') {
	if (emptyField(aForm.from.value) || emptyField(aForm.to.value)) {
		alert("Please, complete all fields");
	    return false;
	} else {
		if (correctRange(aForm.from.value, aForm.to.value)) {
			return true;			
		} else {
			alert("The selected range is not correct");
			return false;
		}
	}
  } else {
	var codeCount = document.getElementById('inventaryList').options.length;
	if (codeCount == 0) {
		alert("Please, complete all fields"); 
	    return false;
	} else {
		var inventaryList = document.getElementById('inventaryList');
		var allCodes = '';
	  	for (i = 0; i <= inventaryList.options.length - 1; i++) {
			allCodes = allCodes + "'" + inventaryList.options[i].text + "',";
	  	}
  		allCodes = '(' + allCodes.substr(0, allCodes.length - 1) + ')';
	  	document.getElementById('individualCodes').value = allCodes;
	    return true;
	}
  }
}

function changeRange(selectBox) {
	var option = selectBox.value;
	var panel = document.getElementById(option);
	panel.style.display = 'inline';
	if (option == 'continuous') {
		document.getElementById('inventaryList').options.length = 0;
		document.getElementById('individuals').style.display = 'none';
		document.getElementById('individualCodes').value = "";
	} else {
		document.getElementById('from').value = "";
		document.getElementById('to').value = "";
		document.getElementById('continuous').style.display = 'none';
	}
}

function itemExists(code, list) {
  var ok = false;
  var listLength = list.length - 1;
  var count = 0;
  while (!(ok) && (count <= listLength)) {
	if (code == list[count].value) {
	  ok = true;
	}
	count = count + 1;
  }
  return ok;	
}

function addItem() {
  var codeObject = document.getElementById('inventaryCode');
  var inventaryCode = document.getElementById('inventaryCode').value;
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryCode == "") {
    alert('You can�t add an empty code.');
  } else {
    if (itemExists(inventaryCode, inventaryList.options)) {
	  codeObject.value = "";
  	  alert("The code is already included."); 
    } else {  	
	  var optionObject = new Option(inventaryCode, inventaryCode);
  	   if (!IE) {
	     inventaryList.add(optionObject, inventaryList.options[inventaryList.options.length]); 
      } else {
	    inventaryList.add(optionObject, inventaryList.options.length);
	  }
      codeObject.value = "";
    }
  }	
}

function removeItem() {
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryList.selectedIndex == -1) {
  	alert('You have to select a code first.');
  } else {
  	inventaryList.options[inventaryList.selectedIndex] = null;
  }
}

	function addCountryCode() {
		var panel = document.getElementById('addCountryCode');
		panel.style.display = 'inline';
		panel.style.top = mouseY;
		panel.style.left = mouseX;
	}
</script>
</head>
<body onload="javascript: changeRange(document.getElementById('rangeType'))">



From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes countryCodes.dat,NONE,1.1
Message-ID: <E1CmDMl-0002fl-ET@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes

Added Files:
	countryCodes.dat 
Log Message:
Required for barcode generator

--- NEW FILE ---
00 = USA I

93 = Australia

94 = New Zealand

779 = Argentina

773 = Uruguay

30 = France I

84 = Spain

45 = Japan

777 = Bolivia

80 = Italy I

73 = Sweden

40 = Germany

31 = France II

254 = Ucrania





From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig itemsLabelConfig.conf,NONE,1.1
Message-ID: <E1CmDMl-0002fp-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig

Added Files:
	itemsLabelConfig.conf 
Log Message:
Required for barcode generator

--- NEW FILE ---
marginBottom = 25
pageType = A4
columns = 5
systemDpi = 96
labelHeigth = 21
rows = 13
marginLeft = 2
labelWidth = 41




From tipaul at users.sourceforge.net  Thu Jan  6 15:32:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 06:32:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.114,1.115
Message-ID: <E1CmYgW-00045G-3h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/C4

Modified Files:
	Biblio.pm 
Log Message:
improvement of speed for bulkmarcimport.
A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
--- Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
***************
*** 1135,1140 ****
      my $tagfield;
      my $subfield;
!     $sth->execute($frameworkcode, $kohatable . "." . $kohafield );
!     ( $tagfield, $subfield ) = $sth->fetchrow;
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
--- 1135,1139 ----
      my $tagfield;
      my $subfield;
!     ( $tagfield, $subfield ) = MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
***************
*** 2635,2638 ****
--- 2634,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.115  2005/01/06 14:32:17  tipaul
+ # improvement of speed for bulkmarcimport.
+ # A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
+ # this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.
+ #
  # Revision 1.114  2005/01/03 10:48:33  tipaul
  # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)




From tipaul at users.sourceforge.net  Thu Jan  6 16:25:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 07:25:38 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CmZW6-000743-RB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27117/fr

Added Files:
	migrer_ses_donnees.xml 
Log Message:
document explaining how to migrate data & set up a highly tuned Koha catalogue (in French, sorry for frenchphobes or french-ignorants)

--- NEW FILE ---
<?xml version="1.0" encoding="ISO-8859-15"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<book>
  <title>Param�trer et migrer ses donn�es vers Koha 2.2</title>

  <chapter>
    <title>Introduction</title>

    <articleinfo><pubdate>2002-01-06</pubdate> <author>
    <firstname>Paul</firstname> <surname>POULAIN</surname> <authorblurb>
    Consultant ind�pendant en logiciels libres, Koha "Release Manager" pour la
    version 2.0 puis 2.2, membre du comit� de pilotage
    international<para></para></authorblurb><email>paul AT koha-fr.org</email>
    </author> <revhistory> <revision><revnumber>2.2.0</revnumber>
    <date>2005-01-06</date> <authorinitials>pp</authorinitials>
    <revdescription> Version initiale<para></para> </revdescription>
    </revision> </revhistory></articleinfo>

[...1138 lines suppressed...]
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);

</programlisting>

        <para>Notez que le code qui pr�c�de ne traite pas des notices
        d'exemplaire (l�, c'est vraiment trop sp�cifique)</para>
      </section>
    </section>
  </chapter>
</book>



From shedges at users.sourceforge.net  Mon Jan 10 12:59:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 10 Jan 2005 03:59:20 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,1.1,1.2
Message-ID: <E1CnyCe-0000CJ-0N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv749

Modified Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Add info on Apache and selinux

Index: Installing_Koha_on_Fedora.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/installation/Installing_Koha_on_Fedora.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Installing_Koha_on_Fedora.xml	2 Jan 2005 14:12:40 -0000	1.1
--- Installing_Koha_on_Fedora.xml	10 Jan 2005 11:59:17 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2005-01-03</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-09</pubdate>
  
      <author>
***************
*** 24,27 ****
--- 24,39 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-08</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Add information on SELinux to Apache section</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 457,461 ****
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust selinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
--- 469,473 ----
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust SELinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
***************
*** 522,525 ****
--- 534,561 ----
        <application>Apache</application>'s log files are in
        <filename>/var/log/httpd</filename>.</para>
+ 
+       <para>As with <application>MySQL</application>, there is an issue with
+       SELinux on <application>Fedora Core</application> 3 and the
+       <application>Apache</application> web server that prevents execution of
+       the CGI scripts. Instead of disabling SELinux for httpd, just change the
+       context for the <application>Koha</application> directories. The utility
+       for doing this is called '<command>chcon</command>.' Here's a brief
+       description of how to use it:</para>
+ 
+       <para>First, check the context for the directories that you know work
+       for httpd:<literallayout>[root at koha]# ls -Z /var/www/
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_script_exec_t cgi-bin
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t error
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t html
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t icons
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t manual
+ drwxr-xr-x  webalize root     system_u:object_r:httpd_sys_content_t usage</literallayout></para>
+ 
+       <para>Then, use the <command>chcon</command> utility to label the Koha
+       subdirectories as for their counterparts in
+       <filename>/var/www</filename>. Here's the syntax:<literallayout><userinput>chcon &lt;context&gt; /usr/local/koha/&lt;subdirectory&gt;</userinput></literallayout></para>
+ 
+       <para>For more info on SELinux check out the Fedora Core 3 FAQ: <ulink
+       url="http://fedora.redhat.com/docs/selinux-faq-fc3/">http://fedora.redhat.com/docs/selinux-faq-fc3/</ulink></para>
      </section>
  




From oleonard at users.sourceforge.net  Mon Jan 10 17:46:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:46:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.4.2.1
Message-ID: <E1Co2gz-0007Uw-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28801/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 17:49:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:49:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.5
Message-ID: <E1Co2jH-0007eH-Mz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29393/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:49:17 -0000	1.5
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:00:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:00:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marc_subfields_structure.tmpl,1.2,1.3
Message-ID: <E1Co2u9-0008Lm-GF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32072/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Synching with default tempalte

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marc_subfields_structure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marc_subfields_structure.tmpl	10 Jan 2005 17:00:30 -0000	1.3
***************
*** 4,120 ****
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
! <!-- TMPL_IF name="add_form" -->
! <!-- -->
! 
! 	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<h1><!-- TMPL_VAR name="action" --></h1>
! 	<div class="table"><table>
! 	<tr><th>Field</th>
! 		<th>Lib for librarians / for opac</th>
! 		<th>Repeat</th>
! 		<th>Mand</th>
! 		<th>Koha field</th>
! 		<th>Tab</th>
! 		<th>Authorised value or<br/>
! 				Thesaurus category</th>
! 	</tr>
! 	<!-- TMPL_LOOP name="loop" -->
! 		<tr>
! 		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
! <td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="40" maxlength="80" /><br />
! 				<input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="40" maxlength="80" /></td>
! 		
! 		<td><!-- TMPL_VAR name="repeatable" --></td>
! 		<td><!-- TMPL_VAR name="mandatory" --></td>
! 		<td><!-- TMPL_VAR name="kohafield" --></td>
! 		<td><!-- TMPL_VAR name="tab" --></td>
! 		<td><!-- TMPL_VAR name="authorised_value" --><br/>
! 				or <!-- TMPL_VAR name="thesaurus_category" --><br/>
! 				or <!-- TMPL_VAR name="value_builder" --></td></tr>
  	<!-- /TMPL_LOOP -->
! 	</table>	<input type="submit" class="submit" value="OK" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" />
! 	<p>Note : in the last column, you can choose :</p>
! 	<ul><li>An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table</li>
! 	<li>A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table</li>
! 	<li>A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly</li>
  	</ul>
! 	</div>
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirm" -->
! <!-- -->
! <div class="table details"><table>
! <caption>Confirm Deletion of Subfield <em><!-- TMPL_VAR name="tagsubfield" --></em></caption>
  	<tr>
! 		<th>Subfield</th>
! 		<td><!-- TMPL_VAR name="tagsubfield" --></td>
  	</tr>
- 	<tr><th>&nbsp;</th><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
- </table></div>
- 	<div class="tabitem">	<form action="<!-- TMPL_VAR name="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" />
- 	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
- 	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" /><input type="submit" class="cancel"  value="Delete this Subfield" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="submit" class="submit" value="Do not Delete" /></form></div>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirmed" -->
! <!-- -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR name="script_name" --> method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
! 	<input type="submit" class="submit"  value="OK" />
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- -->
! <!-- TMPL_IF name="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit". </p>
! <p>The column <b>koha field</b> shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link
! ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.</p>
! <div class="table">
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Lib</th>
! 	<th>Koha Field <span class="help" title="the koha-DB field linked to this subfield">?</span></th>
! 	<th>Rep <span class="help" title="subfield may be repeated (1=yes, 0=no)">?</span></th>
! 	<th>Mand <span class="help" title="subfield is mandatory (1=yes, 0=no)">?</span></th>
! 	<th>Tab <span class="help" title="subfield is shown in which tab (0-9 or item)">?</span></th>
! 	<th>Auth value <span class="help" title="values authorised for this subfield">?</span></th>
! 	<th>Thesaurus <span class="help" title="Thesaurus linked to this subfield">?</span></th>
! 	<th>Val build <span class="help" title="Value builder">?</span></th>
  	<th>Delete</th>
! </tr>
! <!-- TMPL_LOOP name="loop" -->
! <tr>
! 	<td><!-- TMPL_IF name="tagsubfield" --><!-- TMPL_VAR name="tagsubfield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="liblibrarian" --><!-- TMPL_VAR name="liblibrarian" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="kohafield" --><!-- TMPL_VAR name="kohafield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="repeatable" --><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="mandatory" --><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="tab" --><!-- TMPL_VAR name="tab" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="authorised_value" --><!-- TMPL_VAR name="authorised_value" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="thesaurus_category" --><!-- TMPL_VAR name="thesaurus_category" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="value_builder" --><!-- TMPL_VAR name="value_builder" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table>
  
! <div class="tabitem"><!-- TMPL_IF name="previous" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" /></a><!-- /TMPL_IF --> 
! 
! <form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" method="get"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="hidden" name="op" value="add_form" /><input type="submit" value="Edit Subfields" class="submit" /></form>
! 
! <form action="marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="tagfield" -->" name="searchfield" /><input type="submit" class="submit" value="&lt;&lt; Back to Tag" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" /></a><!-- /TMPL_IF --></div>
! </div>
  <!-- /TMPL_IF -->
- 
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 4,171 ----
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
! <!-- TMPL_IF NAME="add_form" -->
! <!-- ------------------------------------------------------------------------ -->
! 	<h1><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
! 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
! 	
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<table>
! 		<caption><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2></caption>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>MARC constraints</h3></th></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="repeatable">Repeatable: </label></td><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="mandatory">Mandatory: </label></td><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="seealso">Search also: </label></td><td><input type="text" id="seealso" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" />(example for 200a : '200c','200d','200e'...)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Koha link:</label></td><td><!-- TMPL_VAR NAME="kohafield" --></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>Editor constaints</h3></th>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Text for librarian</label></td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="libopac">Text for OPAC</label></td><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Managed in tab</label></td><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>hidden&nbsp;</label></td><td><!-- TMPL_VAR NAME="hidden" -->(subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label> URL&nbsp;</label></td><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authorised_value">Auth value:</label></td><td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		</tr>									 
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authtypes">...or Thesaurus:</label></td><td><!-- TMPL_VAR NAME="authtypes" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="value_builder">...or Plugin:</label></td><td><!-- TMPL_VAR NAME="value_builder" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="link">...or Link:</label></td><td><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)</td>
! 		</tr></table><br />
  	<!-- /TMPL_LOOP -->
! 	
! 	<input type="submit" class="submit" value="Save Changes">
! 	<p>Note: in the last column, you can choose:</p>
! 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
! 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
! 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
  	</ul>
! 	
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirm" -->
! <!-- ------------------------------------------------------------------------ -->
! <table border="0" cellspacing="0" cellpadding="2">
! 	<tr valign="top" bgcolor="#99cc33">
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Subfield</b></td>
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
! 	</tr>
! 	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
! 			</form>
! 		</td>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
! 			</form>
! 		</td>
  	</tr>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirmed" -->
! <!-- ------------------------------------------------------------------------ -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 	<input type="submit" value="OK">
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- ------------------------------------------------------------------------ -->
! <!-- TMPL_IF NAME="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="frameworkcode" -->(framework <!--TMPL_VAR NAME="frameworkcode" -->)<!-- /TMPL_IF --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
! <p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
! 
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
! 	<th>Constraints</th>
  	<th>Delete</th>
! <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
! 		<!-- TMPL_ELSE -->
! 			<!-- TMPL_VAR NAME="liblibrarian" -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i>subfield ignored</i>
! 		<!-- TMPL_ELSE -->
! 			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td><a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table><form class="inline" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" method="get"><input type="hidden" value="add_form" name="op" /><input type="hidden" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" name="tagfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="framworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Edit these Parameters" /></form>
! <form class="inline" action="/cgi-bin/koha/admin/marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR NAME="tagfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Back to MARC Tag Structure" /></form>
  
! <!-- TMPL_IF NAME="previous" -->
! 	<input type="submit" class="submit" value="&lt;&lt; Previous" />
! 	</a><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="next" -->
! 	<!-- TMPL_VAR NAME="next" -->
! 		<input type="submit" class="submit" value="Next &gt;&gt;" />
! 	</a>
! <!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:02:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:02:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1 bull-home.tmpl,1.1,1.2 order.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search-supply.tmpl,1.1,1.2 search.tmpl,1.1,1.2 statecollection.tmpl,1.2,1.3 subscription-add.tmpl,1.2,1.3
Message-ID: <E1Co2wU-0008WJ-9H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32715/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:05:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:05:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.1,1.1.2.1 order.tmpl,1.1,1.1.2.1 result.tmpl,1.1,1.1.2.1 search-supply.tmpl,1.1,1.1.2.1 search.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.2,1.2.2.1 subscription-add.tmpl,1.2,1.2.2.1
Message-ID: <E1Co2yY-0000Ea-Uu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
      Tag: rel_2_2
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:07:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:07:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1 acqui-topmenu.inc,1.1,1.2
Message-ID: <E1Co30v-0000NV-IQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1375/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	acqui-topmenu.inc 
Added Files:
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:07:13 -0000	1.2
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 18:08:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:08:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1.2.1 acqui-topmenu.inc,1.1,1.1.2.1
Message-ID: <E1Co320-0000Sg-2u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1761/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	acqui-topmenu.inc 
Added Files:
      Tag: rel_2_2
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:08:36 -0000	1.1.2.1
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 22:33:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:33:57 -0800
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25,1.26
Message-ID: <E1Co7Aj-0007XZ-Br@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28953/admin

Modified Files:
	marctagstructure.pl 
Log Message:
Moving HTML markup to the template

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** marctagstructure.pl	4 Oct 2004 20:37:14 -0000	1.25
--- marctagstructure.pl	10 Jan 2005 21:33:54 -0000	1.26
***************
*** 125,133 ****
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag",
! 								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
  		$template->param('heading-add-tag-p' => 1);
  	}
--- 125,132 ----
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => $searchfield);
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag");
  		$template->param('heading-add-tag-p' => 1);
  	}
***************
*** 225,231 ****
  		$row_data{mandatory} = $results->[$i]{'mandatory'};
  		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
- 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
  		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
--- 224,227 ----




From oleonard at users.sourceforge.net  Mon Jan 10 22:34:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:34:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27,1.28
Message-ID: <E1Co7BV-0007aj-Ks@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** marctagstructure.tmpl	19 Jul 2004 19:20:29 -0000	1.27
--- marctagstructure.tmpl	10 Jan 2005 21:34:42 -0000	1.28
***************
*** 147,153 ****
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->
--- 147,153 ----
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:38:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:38:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.2,1.3
Message-ID: <E1Co7FS-0007r2-Uq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30175/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
***************
*** 62,71 ****
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
- <!-- -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
--- 62,70 ----
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_IF NAME="searchfield" --><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR name="searchfield" --><!-- TMPL_ELSE --><input type="text" name="tagfield" size="3" maxlength="3" /><!-- /TMPL_IF --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
***************
*** 124,135 ****
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem"><!-- TMPL_IF name="previous" --><!-- TMPL_VAR name="previous" -->&lt;&lt;Previous Tags</a><!-- TMPL_ELSE --><!-- /TMPL_IF -->
! <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! 	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add tag" class="submit" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" -->Next Tags &gt;&gt;</a><!-- /TMPL_IF --></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 123,142 ----
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem">		<!-- TMPL_IF NAME="isprevpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="hidden" name="op" value="add_form">
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<input type="submit" class="submit" value="Add Tag"></form>		
! 		<!-- TMPL_IF NAME="nextpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="Next Page &gt;&gt;" class="submit" /></form>
! 		<!-- /TMPL_IF --></div>
! <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:45:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:45:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.3,1.4
Message-ID: <E1Co7M4-0008Ow-6D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32267/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Minor correction to HTML

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
--- marctagstructure.tmpl	10 Jan 2005 21:45:37 -0000	1.4
***************
*** 86,90 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  
--- 86,90 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  




From acli at users.sourceforge.net  Tue Jan 11 10:33:22 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:33:22 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,NONE,1.1.2.1
Message-ID: <E1CoIOw-00033E-5R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11467

Added Files:
      Tag: rel_2_2
	update.pl 
Log Message:
update.pl emulation script


--- NEW FILE ---
#!/usr/bin/perl

# Convenience script to update a po file
# This emulates the GNOME "update.pl" script

use strict;
use integer;

my $lang = $ARGV[0];
die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;

my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/

for my $spec (['css', 'opac'], ['default', 'intranet']) {
   my($theme, $module) = @$spec;
   my $pid = fork;
   die "fork: $!\n" unless defined $pid;
   if (!$pid) {
      if ($chdir_needed_p) {
	 chdir('..') || die "..: cd: $!\n";
      }
      exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
      die "tmpl_process3.pl: exec: $!\n";
   }
   wait;
}





From acli at users.sourceforge.net  Tue Jan 11 10:40:45 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:40:45 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CoIW5-0003P7-Qn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13054

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Minor comment correction


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** update.pl	11 Jan 2005 09:33:19 -0000	1.1.2.1
--- update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
***************
*** 1,5 ****
  #!/usr/bin/perl
  
! # Convenience script to update a po file
  # This emulates the GNOME "update.pl" script
  
--- 1,5 ----
  #!/usr/bin/perl
  
! # Convenience script to update two po files at once
  # This emulates the GNOME "update.pl" script
  




From acli at users.sourceforge.net  Tue Jan 11 10:51:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:51:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.2,1.1.2.3
Message-ID: <E1CoIg2-0003wx-B4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15036

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
More comments in the code to explain what it does
and check the language code command line argument a bit more carefully


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
--- update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
***************
*** 8,24 ****
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;
  
! my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/
  
! for my $spec (['css', 'opac'], ['default', 'intranet']) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
!       exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
        die "tmpl_process3.pl: exec: $!\n";
     }
--- 8,39 ----
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
! # Remember whether we see the "po" directory; this is used later to guess
! # whether the current directory is translator/po or translator.
! my $chdir_needed_p = 1 unless -d('po');
  
! # Go through the theme/module combinations we need to update. There can be
! # more than two; e.g., if we want ['default', 'opac'] too we can put it in
! for my $spec (
!       ['css',     'opac'    ],
!       ['default', 'intranet']
! ) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
+ 
+       # If current directory is translator/po instead of translator,
+       # then go back to the parent
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
! 
!       # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
! 	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
! 
        die "tmpl_process3.pl: exec: $!\n";
     }




From shedges at users.sourceforge.net  Tue Jan 11 12:39:13 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Tue, 11 Jan 2005 03:39:13 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/maintenance Updating_Koha.xml,1.1,1.2
Message-ID: <E1CoKMj-0001nf-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6898

Modified Files:
	Updating_Koha.xml 
Log Message:
minor change to cvs command following official 2.2.0 release

Index: Updating_Koha.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/maintenance/Updating_Koha.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Updating_Koha.xml	24 Dec 2004 15:44:59 -0000	1.1
--- Updating_Koha.xml	11 Jan 2005 11:39:09 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2004-12-15</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-11</pubdate>
  
      <author>
***************
*** 28,31 ****
--- 28,44 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-09</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Minor change to cvs command following official release of
+           2.2.0</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 173,177 ****
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co
      koha</userinput></para>
  
--- 186,190 ----
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co -r rel_2_2
      koha</userinput></para>
  




From tipaul at users.sourceforge.net  Tue Jan 11 15:45:43 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 06:45:43 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115,1.115.2.1
Message-ID: <E1CoNHD-0002Ik-9S@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
bugfix : issn were not stored correctly in non-MARC DB on biblio modification

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115
retrieving revision 1.115.2.1
diff -C2 -r1.115 -r1.115.2.1
*** Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
--- Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
***************
*** 1602,1607 ****
  sub OLDmodbibitem {
      my ( $dbh, $biblioitem ) = @_;
- 
-     #    my $dbh   = C4Connect;
      my $query;
  
--- 1602,1605 ----
***************
*** 1609,1612 ****
--- 1607,1611 ----
      $biblioitem->{'url'}           = $dbh->quote( $biblioitem->{'url'} );
      $biblioitem->{'isbn'}          = $dbh->quote( $biblioitem->{'isbn'} );
+     $biblioitem->{'issn'}          = $dbh->quote( $biblioitem->{'issn'} );
      $biblioitem->{'publishercode'} =
        $dbh->quote( $biblioitem->{'publishercode'} );
***************
*** 1628,1631 ****
--- 1627,1631 ----
  url             = $biblioitem->{'url'},
  isbn            = $biblioitem->{'isbn'},
+ issn            = $biblioitem->{'issn'},
  publishercode   = $biblioitem->{'publishercode'},
  publicationyear = $biblioitem->{'publicationyear'},
***************
*** 1645,1650 ****
          warn "$query";
      }
- 
-     #    $dbh->disconnect;
  }    # sub modbibitem
  
--- 1645,1648 ----
***************
*** 2634,2637 ****
--- 2632,2638 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
+ # bugfix : issn were not stored correctly in non-MARC DB on biblio modification
+ #
  # Revision 1.115  2005/01/06 14:32:17  tipaul
  # improvement of speed for bulkmarcimport.




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.tmpl,1.2,1.2.2.1 result.tmpl,1.4,1.4.2.1 subscription-detail.tmpl,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uN-Pl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.tmpl	5 Aug 2004 16:35:43 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 15:07:59 -0000	1.2.2.1
***************
*** 24,28 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 24,28 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** result.tmpl	2 Dec 2004 16:42:15 -0000	1.4
--- result.tmpl	11 Jan 2005 15:07:59 -0000	1.4.2.1
***************
*** 5,9 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
--- 5,9 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
***************
*** 13,21 ****
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 13,21 ----
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 48,52 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
  				</td>
  			</tr>
--- 48,52 ----
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
  				</td>
  			</tr>
***************
*** 57,61 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
--- 57,61 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
***************
*** 63,71 ****
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 63,71 ----
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** subscription-detail.tmpl	2 Nov 2004 16:29:13 -0000	1.6
--- subscription-detail.tmpl	11 Jan 2005 15:07:59 -0000	1.6.2.1
***************
*** 6,9 ****
--- 6,12 ----
  <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Issues</a>
  <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Biblio</a>
+ <!-- TMPL_UNLESS name="totalissues" -->
+ 	<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
+ <!-- /TMPL_UNLESS -->
  <form method="post" name="f">
  <div id="bloc25">




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25,1.25.2.1
Message-ID: <E1CoNcq-0003uJ-1v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
--- MARCdetail.pl	11 Jan 2005 15:08:00 -0000	1.25.2.1
***************
*** 57,61 ****
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionfrom biblionumber
  use HTML::Template;
  
--- 57,61 ----
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionsfrombiblionumber
  use HTML::Template;
  
***************
*** 190,194 ****
  }
  
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
--- 190,194 ----
  }
  
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
***************
*** 196,200 ****
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionid => $subscriptionid,
  						popup => $popup,
  						);
--- 196,200 ----
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionsnumber => $subscriptionsnumber,
  						popup => $popup,
  						);




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uF-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** Bull.pm	3 Dec 2004 14:34:54 -0000	1.6
--- Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
***************
*** 45,49 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &getsubscriptions &getsubscription &getsubscriptionfrombiblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
--- 45,50 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
! 			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
***************
*** 137,150 ****
  	$sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq, $subscriptionid, $val->{'biblionumber'}, 1, format_date_in_iso($startdate));
- 
- 	# next issue number
- 	#my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
- 	# next date (calculated from actual date & frequency parameters)
- 	#my $nextplanneddate = Get_Next_Date($startdate,$val);
- # 	$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
- # 													innerloop1=?,innerloop2=?,innerloop3=?
- # 													where subscriptionid = ?");
- # 	$sth->execute($newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3,$subscriptionid);
- # 	$sth->finish;  
  	return $subscriptionid;
  }
--- 138,141 ----
***************
*** 167,176 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscriptionid from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionid = $sth->fetchrow;
! 	return $subscriptionid;
  }
  
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
--- 158,186 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select count(*) from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionsnumber = $sth->fetchrow;
! 	return $subscriptionsnumber;
  }
  
+ sub get_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ?');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		push @res,$subs;
+ 	}
+ 	return \@res;
+ }
+ 
+ 
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
***************
*** 197,208 ****
  }
  
  sub getsubscriptions {
! 	my ($title,$ISSN) = @_;
! 	return unless $title or $ISSN;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 	$sth->execute("%$title%",$ISSN);
! 	my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
--- 207,235 ----
  }
  
+ sub delsubscription {
+ 	my ($subscriptionid) = @_;
+ 	# check again there is only one issue (the subscription is new)
+ 	my ($totalissues) = getserials($subscriptionid);
+ 	if ($totalissues eq 1) {
+ 		my $dbh = C4::Context->dbh;
+ 		$subscriptionid=$dbh->quote($subscriptionid);
+ 		$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from serial where subscriptionid=$subscriptionid");
+ 	}
+ }
  sub getsubscriptions {
! 	my ($title,$ISSN,$biblionumber) = @_;
! 	return unless $title or $ISSN or $biblionumber;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	if ($biblionumber) {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
! 		$sth->execute($biblionumber);
! 	} else {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 		$sth->execute("%$title%",$ISSN);
! 	}
! 		my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
***************
*** 217,221 ****
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription.
  sub getserials {
  	my ($subscriptionid) = @_;
--- 244,250 ----
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription
! # as well as the number of issues registered in the database (all types)
! # this number is used to see if a subscription can be deleted (=it must have only 1 issue)
  sub getserials {
  	my ($subscriptionid) = @_;
***************
*** 230,234 ****
  		push @serials,$line;
  	}
! 	return @serials;
  }
  
--- 259,266 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:31 -0800
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3,1.3.2.1 subscription-detail.pl,1.5,1.5.2.1
Message-ID: <E1CoNdH-0003vz-EA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl subscription-detail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** statecollection.pl	12 Aug 2004 14:36:07 -0000	1.3
--- statecollection.pl	11 Jan 2005 15:07:57 -0000	1.3.2.1
***************
*** 40,44 ****
  }
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
--- 40,44 ----
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
--- subscription-detail.pl	11 Jan 2005 15:07:58 -0000	1.5.2.1
***************
*** 70,75 ****
  }
  
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 70,83 ----
  }
  
+ if ($op eq 'del') {
+ 	&delsubscription($subscriptionid);
+ 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+ 	exit;
+ 
+ }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
! $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
! # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
  
  ($template, $loggedinuser, $cookie)
***************
*** 124,127 ****
--- 132,136 ----
  	subscriptionid => $subs->{subscriptionid},
  	serialslist => \@serialslist,
+ 	totalissues => $totalissues,
  	);
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:07 -0800
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36,1.36.2.1
Message-ID: <E1CoNfn-00047i-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15770/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
removing warning

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -r1.36 -r1.36.2.1
*** SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
--- SearchMarc.pm	11 Jan 2005 15:10:49 -0000	1.36.2.1
***************
*** 167,171 ****
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
- 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 167,170 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.35,1.35.2.1
Message-ID: <E1CoNgC-0004AG-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
circulation >> issue : showing borrowernumber code just after the borrower name.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** circulation.tmpl	15 Dec 2004 10:47:10 -0000	1.35
--- circulation.tmpl	11 Jan 2005 15:11:29 -0000	1.35.2.1
***************
*** 32,37 ****
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
  				</a>
  			</p>
--- 32,37 ----
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
  				</a>
  			</p>




From tipaul at users.sourceforge.net  Tue Jan 11 16:13:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:13:39 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,NONE,1.1.2.1 buildEDITORS.pl,NONE,1.1.2.1
Message-ID: <E1CoNiF-0004Hu-Ng@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16469/misc/migration_tools

Added Files:
      Tag: rel_2_2
	build6xx.pl buildEDITORS.pl 
Log Message:
new migration tools :
* build6xx : script that build 6xx tags in authority list. Note this script is a framework, it MUST be tuned.
* buildEDITORS : script that build EDITORS authority file from biblios. Useful for unimarc_210c and uinmarc_225a plugins. run without parameters to get help.

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$category,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$subfields,
    'v' => \$verbose,
    'c:s' => \$category,
);

if ($version || ($category eq '')) {
	print <<EOF
small script to recreate a authority table into Koha.
parameters :
\tc : thesaurus category. Can be filled with anything, the NC is hardcoded. But mandatory to confirm that you want to rebuild 6xx
\d : delete every entry of the selected category before doing work.

SAMPLES :
 ./build6xx.pl -c NC -d 
EOF
;#
die;
}

my $dbh = C4::Context->dbh;
my @subf = $subfields =~ /(##\d\d\d##.)/g;
if ($delete) {
	print "deleting thesaurus\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='NC'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='NC'");
	$dbh->do("delete from marc_subfield_table where tag='606' and subfieldcode='9'");
	$dbh->do("delete from marc_word where tagsubfield='6069'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;

# search biblios to "connect" to an authority with any number of $x (limited to 4 $x in this script)
my $sthBIBLIOS = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 where tag in (606) and subfieldcode='a' and subfieldvalue=?");
my $sthBIBLIOSx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=?");
my $sthBIBLIOSxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m3.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=?");
my $sthBIBLIOSxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=?");
my $sthBIBLIOSxxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid left join marc_subfield_table as m5 on m1.bibid=m5.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m5.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=? and m5.subfieldvalue=?");

# loop through each biblio
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $timeneeded = gettimeofday - $starttime;
	print "$i in $timeneeded s\n" unless ($i % 50);
	foreach my $field ($record->field(995)) {
		$record->delete_field($field);
	}
	my $totdone=0;
	my $authid;
	# search the 606 field(s)
	foreach my $field ($record->field("606")) {
		foreach my $authentry ($field->subfield("a")) {
			# the hashentry variable contains all $x fields and the $a in a single string. Used to differenciate
			# $xsomething$aelse and $asomething else
			my $hashentry = $authentry;
			foreach my $x ($field->subfield('x')) {
				$hashentry.=" -- $x";
			}
			# remove �,�,$e...
			# all the same for mysql, but NOT for perl hashes !
			# without those lines, t�t is not tot and pat�e is not patee
			$hashentry =~ s/�|�|�/e/g;
			$hashentry =~ s/�|�/a/g;
			$hashentry =~ s/�/i/g;
			$hashentry =~ s/�/o/g;
			$hashentry =~ s/�|�/u/g;
			# uppercase all, in case of typing error.
			$hashentry = uc($hashentry);
			$totdone++;
			if ($alreadydone{$hashentry}) {
				$authid = $alreadydone{$hashentry};
				print ".";
			} else {
				print "*";
				#create authority.
				my $authorityRecord = MARC::Record->new();
				my $newfield = MARC::Field->new(250,'','','a' => "".$authentry);
				foreach my $x ($field->subfield('x')) {
					$newfield->add_subfields('x' => $x);
				}
				foreach my $z ($field->subfield('z')) {
					$newfield->add_subfields('z' => $z);
				}
				$authorityRecord->insert_fields_ordered($newfield);
				$authid=AUTHaddauthority($dbh,$authorityRecord,'','NC');
				$alreadydone{$hashentry} = $authid;
				# we have the authority number, now we update all biblios that use this authority...
				my @x = $field->subfield('x'); # depending on the number of $x in the subfield
				if ($#x eq -1) { # no $x
					$sthBIBLIOS->execute($authentry);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS->fetchrow) {
						# check that the field does not already have a $x (if it has, it will or has been managed by another authority
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						# loop in each 606 field
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							# and rebuild the $x -- $x -- $a string (like for $hashentry, few lines before)
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							# ok, it's confirmed that we must add the $9 subfield for this biblio, so...
							$isOK=1 if $inEntry eq $hashentry;
						}
						# ... add it !
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 0) { # one $x
					$sthBIBLIOSx->execute($authentry,$x[0]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 1) { # two $x
					$sthBIBLIOSxx->execute($authentry,$x[0],$x[1]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 2) { # 3 $x
					$sthBIBLIOSxxx->execute($authentry,$x[0],$x[1],$x[2]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 3) { # 3 $x
					$sthBIBLIOSxxxx->execute($authentry,$x[0],$x[1],$x[2],$x[3]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/�|�|�/e/g;
							$inEntry =~ s/�|�/a/g;
							$inEntry =~ s/�/i/g;
							$inEntry =~ s/�/o/g;
							$inEntry =~ s/�|�/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x >4) {
					# too many $x, not handled, warn the developper that tries to migrate
					print "warning there is ".$#x.'$x values';
				}
			}
		}
	}
	$i++;
}
my $timeneeded = gettimeofday - $starttime;
print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild EDITORS

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $confirm,$delete);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'v' => \$verbose,
    'c' => \$confirm,
);

if ($version or !$confirm) {
	print <<EOF
small script to recreate a authority table into Koha.
This will parse all your biblios to recreate isbn / editor / collections for the unimarc_210c and unimarc_225a plugins.

Remember those plugins will work only if you have an EDITORS authority type, with
\t200a being the first 2 parts of an ISBN
\t200b being the editor name
\t200c (repeatable) being the series title

parameters :
\t-c : confirmation flag. the script will run only with this flag. Otherwise, it will just show this help screen.
\t-d : delete existing EDITORS before rebuilding them
\t-t : test parameters : run the script but don't create really the EDITORS
EOF
;#'

exit;
}

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting EDITORS\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='EDITORS'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='EDITORS'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;
my $counter;
my %hash;
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $isbnField = $record->field('010');
	next unless $isbnField;
	my $isbn=$isbnField->subfield('a');
	my $seg1;
	if(substr($isbn, 0, 1) <=7) {
		$seg1 = substr($isbn, 0, 1);
	} elsif(substr($isbn, 0, 2) <= 94) {
		$seg1 = substr($isbn, 0, 2);
	} elsif(substr($isbn, 0, 3) <= 995) {
		$seg1 = substr($isbn, 0, 3);
	} elsif(substr($isbn, 0, 4) <= 9989) {
		$seg1 = substr($isbn, 0, 4);
	} else {
		$seg1 = substr($isbn, 0, 5);
	}
	my $x = substr($isbn, length($seg1));
	my $seg2;
	if(substr($x, 0, 2) <= 19) {
# 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
		$seg2 = substr($x, 0, 2);
	} elsif(substr($x, 0, 3) <= 699) {
		$seg2 = substr($x, 0, 3);
	} elsif(substr($x, 0, 4) <= 8399) {
		$seg2 = substr($x, 0, 4);
	} elsif(substr($x, 0, 5) <= 89999) {
		$seg2 = substr($x, 0, 5);
	} elsif(substr($x, 0, 6) <= 9499999) {
		$seg2 = substr($x, 0, 6);
	} else {
		$seg2 = substr($x, 0, 7);
	}
	$counter++;
	print ".";
	my $timeneeded = gettimeofday - $starttime;
	print "$counter in $timeneeded s\n" unless ($counter % 50);
	
	my $field = $record->field('210');
	my $editor;
	$editor=$field->subfield('c') if $field;
	
	$field = $record->field('225');
	my $collection;
	$collection=$field->subfield('a') if $field;
	
	print "WARNING : editor empty for ".$record->as_formatted unless $editor and !$verbose;

	$hash{$seg1.$seg2}->{editors} = $editor unless ($hash{$seg1.$seg2}->{editors});
	$hash{$seg1.$seg2}->{collections}->{$collection}++ if $collection;
}

foreach my $isbnstart (sort keys %hash) {
	print "$isbnstart -- ".$hash{$isbnstart}->{editors} if $verbose;
	my $collections = $hash{$isbnstart}->{collections};
	my $seriestitlelist;
	foreach my $collection (sort keys %$collections) {
		print " CC $collection : ".$collections->{$collection} if $verbose;
		$seriestitlelist.=$collection."|";
	}
	my $authorityRecord = MARC::Record->new();
	my $newfield = MARC::Field->new(200,'','','a' => "".$isbnstart,
												'b' => "".$hash{$isbnstart}->{editors},
												'c' => "".$seriestitlelist);
	$authorityRecord->insert_fields_ordered($newfield);
	my $authid=AUTHaddauthority($dbh,$authorityRecord,'','EDITORS');

# 	print $authorityRecord->as_formatted."\n";
	print "\n" if $verbose;
}
exit;

# 	my $timeneeded = gettimeofday - $starttime;
# 	print "$i in $timeneeded s\n" unless ($i % 50);
# 	foreach my $field ($record->field(995)) {
# 		$record->delete_field($field);
# 	}
# 	my $totdone=0;
# 	my $authid;
# 	foreach my $fieldnumber (('710','711','712')) {
# 		foreach my $field ($record->field($fieldnumber)) {
# 	# 		print "=>".$field->as_formatted."\n";
# 			foreach my $authentry ($field->subfield("a")) {
# 				my $hashentry = $authentry;
# 				# la particularit� de ce script l�, c'est que l'entr�e dans la table d'autorit� est $a -- $b (et pas $x -- $x -- $x -- $a comme pour les autorit�s NC)
# 				# si n�cessaire, compl�ter avec le $c (n'existe pas dans le fichier que j'ai migr� avec cette moulinette
# 				# supprimer les accents, certaines entr�es sont sans, d'autres avec !
# 				# mysql ne diff�rencie pas, mais les hash perl oui !
# 				$hashentry =~ s/�|�|�/e/g;
# 				$hashentry =~ s/�|�/a/g;
# 				$hashentry =~ s/�/i/g;
# 				$hashentry =~ s/�/o/g;
# 				$hashentry =~ s/�|�/u/g;
# 				$hashentry = uc($hashentry);
# 				print "==>$hashentry" if $hashentry =~ /.*ETATS.*/;
# 				$totdone++;
# 				if ($alreadydone{$hashentry}) {
# 					$authid = $alreadydone{$hashentry};
# 					print ".";
# 				} else {
# 					print "*";
# 					#create authority.
# 					my $authorityRecord = MARC::Record->new();
# 					my $newfield = MARC::Field->new(210,'','','a' => "".$authentry, 
# 												'b' => "".$field->subfield('b'),
# 												'c' => "".$field->subfield('c'),
# 												);
# 					$authorityRecord->insert_fields_ordered($newfield);
# 					$authid=AUTHaddauthority($dbh,$authorityRecord,'','CO');
# 					$alreadydone{$hashentry} = $authid;
# 					# OK, on garde la notice d'autorit�, on cherche les notices biblio et on les met � jour...
# 					if ($fieldnumber eq '710') {
# 						$sthBIBLIOS710->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS710->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '711') {
# 						$sthBIBLIOS711->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS711->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '712') {
# 						$sthBIBLIOS712->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS712->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr�e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/�|�|�/e/g;
# 								$inEntry =~ s/�|�/a/g;
# 								$inEntry =~ s/�/i/g;
# 								$inEntry =~ s/�/o/g;
# 								$inEntry =~ s/�|�/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 				}
# 			}
# 		}
# 	}
# 	$i++;
# }
# my $timeneeded = gettimeofday - $starttime;
# print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";




From tipaul at users.sourceforge.net  Tue Jan 11 16:23:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:23:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_221.txt,NONE,1.1.2.1
Message-ID: <E1CoNs5-000596-0q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761/misc/release notes

Added Files:
      Tag: rel_2_2
	release_notes_221.txt 
Log Message:
release notes for 2.2.1

***** Bogus filespec: notes
--- NEW FILE ---
RELEASE NOTES
=============

Koha is the 1st Open-Source Integrated Library System.
Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.

Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).

With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).

========
WARNINGS
========
* the librarian interface is tested only with mozilla/firefox. Should work (partially) with IE. OPAC should work fine with any navigator.
* Any 2.1.x install must be uninstalled before installing 2.2.0 No update is provided for 2.1.0.

=======
DIFFS
=======
Diff 2.2.0 => 2.2.1
*******************
BUGFIXES

***** Critical

***** Minor
* in serials module >> add subscription >> select biblio : The next / previous page were invalid.
* in serials module >> add subscription >> select biblio : impossible to report the biblio when there is a quote in it (' was not escaped)
* issn were not stored correctly in non-MARC DB on biblio modification

IMPROVEMENTS
***** Major
* serial subscriptions : modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.
* serial subscriptions : you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)
**** Minor
* adding publicationyear and series title in opac advanced search form
* in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title
* circulation >> issue : showing borrowernumber code just after the borrower name.

Diff 2.2RC5 => 2.2.0
********************
BUGFIXES

***** Critical
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)

***** Minor
* error in authority => biblio 'jumper' that make the jump fail (was a remaining ')
* when modifying a biblio, on a repeated field with many subfields, the test to show empty subfields in X>1 was wrong : the missing subfields of the 1st field were repeated.
Example :
606 has $a$x$z
1st is 606$a (so $x$z empty)
2nd is 606$a$x
The marc editor in the 2nd field showed before this fix :
606 $a a_value
   $x another_value
   $x
   $z
(the 2nd $x being useless)
* Authorities : Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
IMPROVEMENTS

***** Major
* New systempref parameter : opacstylesheet If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)
* improvements in shelves management in OPAC (synch'ing with librarian interface) : the user can modify a bookshelf, add a book into a bookshelf from the biblio, create a bookshelf "on the fly", from the bookshelf popup.
* new directory migration_tools in $KOHA/misc Will store various migration tools. bulkmarcimport has been moved here.

**** Minor
* minor change in MARCdetail : when a field is repeated, the field header is not repeated but replaced by a nice little empty space.

Diff 2.2RC4 => 2.2RC5
*********************

BUGFIXES

***** Critical
* limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items) In 2.4, a new DB structure will highly speed things and this limit will be removed. FindDuplicate is activated again.
* bugfixes in french translation (that made cataloguing in french impossible)
* set lock_tables_privs = 'Y' during install stage. Note this requires a mysql version not too old.

***** Minor
* during update, if the user enter a different directory for backup than the default one, the updater does not obey and stores in default directory anyway !
* minor (spelling) fix for adding an organization
* member search (bug 851) : stripping out comma and apostrophe from search terms
* various methods to split subjects (depending on OS, a <CR> / <CR><LF> problem)

IMPROVEMENTS

***** Major
* circulation / issue : adding a button to cancel an issue when a confirmation is required (bug #858)
* circulation / issue : adding a checkbox to confirm reserve cancel when a reserved book is issued by someone else (bug #858)
* virtual shelves : adding feature to create a virtual shelf on the fly, when adding a biblio, and feature to modify a virtual shelf name/status
* catalogue : adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd

**** Minor
* an improvement has been done in DB calls that needs a new index. It's automatically added in fresh installs, but for updates, run the following SQL command :
ALTER TABLE `marc_subfield_structure` ADD INDEX ( `kohafield` ) 
* adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* the list of authorities types is now ordered by authtypetext. Thus you can use the "space trick" : if you add a space before an authtype text, it's shown first. Useful when you have an authority type that you use more often than others.
* authoritiy list shown in authtypetext order (so authtypetext with a space appear first, hint used everywhere else for lists)
* some minor html changes (like changing "images" numbers in "text" numbers for result list page numbers.

Diff 2.2RC3 => 2.2RC4
*********************
BUGFIXES

***** Critical
1 CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)
2 CRITICAL bugfix in Biblio.pm, removing &branches declaration (was due to an untested cvs rollback, opac-search.pl was crashing)
3 CRITICAL bugfix in Biblio.pm when MARC=OFF. subjects were stored and immediatly deleted. And not stored correctly in MARC part of the biblio. (thanks to Waylon Robertson)

***** Minor
1 bugfix in updatedatabase (auth_header creation table). Don't affect previous install of 2.2, only upgrades 2.0 => 2.2
2 reading rec : Fixing link to toggle between full and limited display
3 bugfix for moremember.pl that no longer outputed item type for issues
4 defaulting actual cost to estimated cost (was 0 by default)
5 bugfix : in biblio search, - and other signs where not properly managed. Leroy-Beaulieu could not be found
6 the popup of the 210c plugin closes when a collection is choosed
7 bugfix : could not select a biblio in subscription creation if the book was not for loan
8 minor fixes in spelling in subscription
9 adding acquisition in default userflags. This flag can be set for librarians that have access to acquisition
10 in subscription enddate calculation, bugfix when subscription based on number of issues (worked when based on subscription length)
11 in subscription next issue date calculation, bugfix when subscription frequency is 1/quarter.
12 datelastseen is updated when the book is returned
13 moredetail.pl shows incorrect date, incorrectly formatted (bug #689)
14 DuplicateFinder has been disabled : sometimes goes into a looonnnggg lasting loop.
15 when a query returns only one result, adding it to basket did not work.
16 deletion of a suggestion was buggy. Now fixed
17 for installation of Koha under Windows there is a bug with subject splitting. Now fixed. (thanks to Waylon Robertson)

IMPROVEMENTS
***** Major
1 a lot in book shelves
2 Submitting with no barcode in issues should clear for next patron (bug #865)
3 screen added to see late issues from a given bookseller
4 Koha should now work under mod_perl (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)

**** Minor
1 show also item tags into marc list of fields (in librarian search interface)
2 email sent basket : the sender can give it's name, in case the basket is sent to a friend, not to itself
3 removing useless string in isbd view
4 cataloguing, in isbnsearch, after searching a title/ISBN, the librarian can choose the framework (+ it's a cataloguing screen, not an acquisition one)
5 serials : in issues management, the waited/late issues bloc is before the collection state bloc.
6 serials : the intranet note has been removed, it's useless
7 after an authority is added/modified, go to this fresh authority (instead of authority-home)
8 search option in auth-top
9 in OPAC, the itemcallnumber search is a "start by" search (was a contains)
10 opac note is defaulted to '' (was 0, that means nothing)
11 adding blank to relshiploop (altrelationship) loop (Bug ???)
12 when deleting an itemtype, don't check issuingrules, but delete them too
13 For MARC=OFF installation, Waylon submitted a script to rebuild MARC part of the catalogue. It's in misc/updatemarc_subjects.pl (thanks to Waylon Robertson)

Diff 2.2RC2 => 2.2RC3
*********************
* CRITICAL bug in acquisition : biblio badly stored in MARC part of Koha, deleting another biblio...
* CRITICAL problem : the duplicate finder (when adding a biblio) has performances problems under certains circumstances.
* bug #862 fixed : Upgrade does not work (from 2.2RC1 to 2.2RC2)
* bugfix in acquisition, when a line is modified, aqorderbreakdown was duplicated. (Seems it was a mysql return value depending on mysql version)
* bugfix in setting user permissions (they were stored, but not shown correctly after)
* bugfix in translation error for basket sent in OPAC
* bugfix in 225a plugin (editor chooser)
* adding itemcallnumber entry in systempreferences during install
* error in biblio detail showing when MARC=ON (bug from RC2, did not exist before)
* bug in acceptorreject OPAC suggestion (bug from RC2, did not exist before)
* Not really a bug but : stopword must not be empty. If it's empty, the search fail.
* During install, the user can load french and english stopwords if he want.
* French librarian interface seems OK
* addbook (1st page when MARC=ON) is a catalogue screen, not an acquisition one
* The barcode is shown in the list of books issued by a borrower in opac-user page.

Diff 2.2RC1 => 2.2RC2
*********************
* bugfix for import in reservoir : title and isbn where not extracted.
* bugfix in OPAC : it was possible to reserve books that where "notforloan"
* bugfix in circulation : no warning when a reserve was made on a book that you try to issue to someone else. 
* bugfix & improvement for catalogue management behaviour when MARC=OFF
* bugfix in bookshelves (in CVS, probably not in official tar.gz)
* bugfix in online help (in CVS, probably not in official tar.gz)

=============
INSTALLATION
=============
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./installer.pl
* READ and FOLLOW the instructions

READING what is on screen during installation is VERY important. Some decisions you make during install stage are very hard to reproduce after.


UPGRADE from previous 2.0.0preX or RCx version
*******
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./koha.upgrade
* Follow the instructions

UPGRADE from previous 1.2.x version :
********
UPGRADE TO A 2.0.0 version before upgrading

UPGRADE from a 2.1.x version is NOT AVAILABLE. Don't install 2.2 on a 2.1.x test database. A lot of DB changes have been done since 2.1.x & cannot be handled by the DB updater.

=============
NEW FEATURES
=============
Koha 2.2 has, of course, all the previous features from Koha (acquisition, cataloguing, circulation, members modules, OPAC, complete MARC support...) plus the following new ones :

General :
*********
* (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
* Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
* Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
* Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
* mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
* Nelsonville have shared their templates. They are available as NPL theme.
* Language : in this version, only english and french versions are fully functionnal. Spanish and chinese are provided, but not fully functionnal. Polish, German, Arabic, Hebrew, and many other languages have volunteers and should be here in a future 2.2.x


BE CAREFUL with uninstaller : 
1- This script does not ask for confirmation after mysql root password.
2- This script uses /etc/koha.conf. If you have more than 1 koha on your server, use /etc/koha.conf for a "deletable-test" one.

Acquisition :
*************
* suggestion : borrowers can suggest items to buy in OPAC. Then, the librarian can manage (accept or refuse) and order them.
* possibility to close a basket, he can't be modified then
* order a basket by publisher or by bookfund/publisher
* search order history

Cataloguing :
*************
* Cataloguing frameworks : you can define as many frameworks as you want. A framework describes how a material is catalogued (which fields, subfields, which constraints on them...)
* MARC authorities : Koha now supports authorities in MARC. You can define the MARC structure for authorities like for biblios.
* New contraints can be set for subfields :
  - subfield is hidden : appears in MARC editor, but not in OPAC.
  - subfield is an URL : the field can be cliqued
  - related fields : a search made on a subfield also uses other subfields automatically. Using this feature, a search on "title" can search title, but also subtitle, uniform title,...
* Item location can now be done on 3 levels : the branch, the location (room), the callnumber.
* The callnumber can now be calculated from the LC, the dewey, or be freely (and manually) entered.
* Duplicate finder : this powerful feature help your cataloguers avoiding duplicate biblios.
* ISBD view : in librarian interface as well as in OPAC biblios can be shown in standard (default) presentation, in MARC (human readable) or ISBD. The ISBD view can be tuned by the librarian team. There is also a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* UNIMARC plugin for every 1xx fields : ESNMP have developped all the plugins for UNIMARC fields 1xx. Those fields are coded fields.

Serial cataloguing :
********************
Koha 2.2 manage serial subscriptions and issuing of those subscriptions. (Only a few words to describe a very important & complete module !)

Catalogue search :
******************
* Search in OPAC and librarian interface has been improved. They now are exactly the same.
* Spelling suggestion : before sending a request, the user can ask for spelling suggestion. This shows other forms of words entered that would give results. Give poor results for instance, the Koha team is thinking to a true spellchecking.
* The user can select the order of the results and the number of results shown.

Members :
*********
* The borrowernote field is shown on issue and transfer.
* The textmessaging field appears in OPAC when the user logs in.

Circulation :
*************
* New issuing rules : Issuing can be set for branch / borrower type / item category, by number of days and number of items available.
* "joker" issuing rules : the library can set issuing rules for "any branch" or "any borrower type", or "any item category".
Both issuing rules are cumulative : a library can set issuing rules to 10 books, 5 CD, but 12 total (books or CD).

OPAC :
******
In Koha 2.2, koha has :
* baskets. A basket can be printed or sent by mail to the borrower
* virtual shelves : a virtual shelf can be created and filled by any logged borrower. A given virtual shelf can be private or public. Or even free-for-all.
* language chooser : the borrower can change the language on the fly. The default language being still choosen by the library
* complete CSS definition. With a new systempref parameter : opacstylesheet. If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)

Barcode printing :
******************
A new module has been added to the parameters section : barcode printing. It requires the PDF::Api2 Perl package and can print barcode on 

============
Koha Future
============
The future of Koha is being discussed on mailing lists and on koha wiki : http://www.saas.nsw.edu.au/koha_wiki/index.php?page=KohaRoadmap2.2.x




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.15.2.1 opac-serial-issues.tmpl,1.2,1.2.2.1
Message-ID: <E1CoNsW-0005Bz-U5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl opac-serial-issues.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
***************
*** 130,137 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionid" -->
  		<p>
! 			This is a serial subscription. You can see which 
! 				<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have
--- 130,137 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
  		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-serial-issues.tmpl	13 Aug 2004 05:54:55 -0000	1.2
--- opac-serial-issues.tmpl	11 Jan 2005 15:24:14 -0000	1.2.2.1
***************
*** 5,9 ****
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <div id="bloc25">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
--- 5,10 ----
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <!-- TMPL_LOOP name="subscription_LOOP" -->
! <div id="bloc60">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
***************
*** 75,84 ****
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<h2 class="catalogue">Issues summary</h2>
! 	<p>
! 		<!-- TMPL_VAR name="opacnote" -->
! 	</p>
  </div>
! 
  </div>
  
--- 76,87 ----
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<!-- TMPL_IF name="opacnotes" -->
! 		<h2 class="catalogue">Issues summary</h2>
! 		<p>
! 			<!-- TMPL_VAR name="opacnote" -->
! 		</p>
! 	<!-- /TMPL_IF -->
  </div>
! <!-- /TMPL_LOOP -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.14.2.1 opac-serial-issues.pl,1.1,1.1.2.1
Message-ID: <E1CoNsY-0005CB-HC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl opac-serial-issues.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	11 Jan 2005 15:24:14 -0000	1.14.2.1
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 71,75 ****
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionid => $subscriptionid,
  );
  
--- 71,75 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionsnumber => $subscriptionsnumber,
  );
  

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-serial-issues.pl	12 Aug 2004 14:50:29 -0000	1.1
--- opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
***************
*** 18,25 ****
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my ($subscriptionid);
! 
! $subscriptionid = $query->param('subscriptionid');
! my $subscription = &getsubscription($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 18,23 ----
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
  ($template, $loggedinuser, $cookie)
***************
*** 32,57 ****
  
  # replace CR by <br> in librarian note
! $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	startdate => format_date($subscription->{startdate}),
! 	periodicity => $subscription->{periodicity},
! 	dow => $subscription->{dow},
! 	numberlength => $subscription->{numberlength},
! 	weeklength => $subscription->{weeklength},
! 	monthlength => $subscription->{monthlength},
! 	opacnote => $subscription->{opacnote},
! 	numberingmethod => $subscription->{numberingmethod},
! 	arrivalplanified => $subscription->{arrivalplanified},
! 	status => $subscription->{status},
! 	biblionumber => $subscription->{biblionumber},
! 	bibliotitle => $subscription->{bibliotitle},
! 	notes => $subscription->{notes},
! 	subscriptionid => $subscription->{subscriptionid}
  	);
! $template->param(
! 			"periodicity$subscription->{periodicity}" => 1,
! 			"arrival$subscription->{dow}" => 1,
! 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 30,56 ----
  
  # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	subscription_LOOP => $subscriptions
! # 	startdate => format_date($subscription->{startdate}),
! # 	periodicity => $subscription->{periodicity},
! # 	dow => $subscription->{dow},
! # 	numberlength => $subscription->{numberlength},
! # 	weeklength => $subscription->{weeklength},
! # 	monthlength => $subscription->{monthlength},
! # 	opacnote => $subscription->{opacnote},
! # 	numberingmethod => $subscription->{numberingmethod},
! # 	arrivalplanified => $subscription->{arrivalplanified},
! # 	status => $subscription->{status},
! # 	biblionumber => $subscription->{biblionumber},
! # 	bibliotitle => $subscription->{bibliotitle},
! # 	notes => $subscription->{notes},
! # 	subscriptionid => $subscription->{subscriptionid}
  	);
! # $template->param(
! # 			"periodicity$subscription->{periodicity}" => 1,
! # 			"arrival$subscription->{dow}" => 1,
! # 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jan 11 16:31:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:31:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-basket.tmpl,1.3,1.3.2.1
Message-ID: <E1CoNzA-0005fg-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21772/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-basket.tmpl 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: opac-basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.tmpl	13 Aug 2004 05:54:55 -0000	1.3
--- opac-basket.tmpl	11 Jan 2005 15:31:04 -0000	1.3.2.1
***************
*** 21,25 ****
  				<tr>
  					<th>
! 						<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
  					</th>
  				</tr>
--- 21,25 ----
  				<tr>
  					<th>
! 						<a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
  					</th>
  				</tr>




From tipaul at users.sourceforge.net  Tue Jan 11 16:32:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11,1.11.2.1
Message-ID: <E1CoO0e-0005mP-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22197/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
* adding series title and publication year limits in opac-search form.
* minor html improvement

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** opac-search.tmpl	2 Dec 2004 16:46:48 -0000	1.11
--- opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
***************
*** 6,10 ****
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc20">
  		<h2 class="catalogue">Search on</h2>
  		<p>
--- 6,10 ----
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc60">
  		<h2 class="catalogue">Search on</h2>
  		<p>
***************
*** 42,45 ****
--- 42,53 ----
  		</p>
  		<p>
+ 			<label class="label20">Series title</label>
+ 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="contains" />
+ 			<input type="text" name="value" onchange="sql_update()" size="35"/>
+ 		</p>
+ 		<p>
  			<label class="label20">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
***************
*** 95,98 ****
--- 103,120 ----
  			<input type="text" name="value" onchange="sql_update()" />
  		</p>
+ 		<p>
+ 			<label class="label20">Published between</label>
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value=">=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 			and
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="<=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 		</p>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 112,117 ****
  			</select>
  		</p>
- 		<p>&nbsp;</p>
- 		<p>&nbsp;</p>
  	</div>
  	<div id="bloc60">
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles home-go-button.gif,1.2,NONE
Message-ID: <E1CoO1n-0005rf-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images/styles

Removed Files:
      Tag: rel_2_2
	home-go-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- home-go-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:52 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images book.gif,1.2,NONE circle.gif,1.2,NONE disk.gif,1.2,NONE dk-brown-dot.gif,1.2,NONE dvd.gif,1.2,NONE fine.gif,1.2,NONE front-arrow.gif,1.2,NONE front-background-med.gif,1.2,NONE heading-login-2.gif,1.2,NONE heading-login.gif,1.2,NONE heading-member.gif,1.2,NONE heading-search-2.gif,1.2,NONE heading-search-3.gif,1.2,NONE heading-search.gif,1.2,NONE hltlogo.gif,1.2,NONE holder.gif,1.2,NONE jigsaw.gif,1.2,NONE koha.gif,1.2,NONE large-print.gif,1.2,NONE magazine.gif,1.2,NONE map.gif,1.2,NONE picture-book.gif,1.2,NONE place-reserve.jpg,1.2,NONE search-button.gif,1.2,NONE selected-circle.gif,1.2,NONE sm-book.gif,1.2,NONE sm-disk.gif,1.2,NONE sm-dvd.gif,1.2,NONE sm-jigsaw.gif,1.2,NONE sm-lg-print.gif,1.2,NONE sm-picture-book.gif,1.2,NONE sm-tape.gif,1.2,NONE talking-book.gif,1.2,NONE tan-dot.gif,1.2,NONE tape.gif,1.2,NONE vanilla-logout-button.gif,1.2,NONE
Message-ID: <E1CoO1o-0005ro-8x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images

Removed Files:
      Tag: rel_2_2
	book.gif circle.gif disk.gif dk-brown-dot.gif dvd.gif fine.gif 
	front-arrow.gif front-background-med.gif heading-login-2.gif 
	heading-login.gif heading-member.gif heading-search-2.gif 
	heading-search-3.gif heading-search.gif hltlogo.gif holder.gif 
	jigsaw.gif koha.gif large-print.gif magazine.gif map.gif 
	picture-book.gif place-reserve.jpg search-button.gif 
	selected-circle.gif sm-book.gif sm-disk.gif sm-dvd.gif 
	sm-jigsaw.gif sm-lg-print.gif sm-picture-book.gif sm-tape.gif 
	talking-book.gif tan-dot.gif tape.gif 
	vanilla-logout-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- book.gif DELETED ---

--- circle.gif DELETED ---

--- disk.gif DELETED ---

--- dk-brown-dot.gif DELETED ---

--- dvd.gif DELETED ---

--- fine.gif DELETED ---

--- front-arrow.gif DELETED ---

--- front-background-med.gif DELETED ---

--- heading-login-2.gif DELETED ---

--- heading-login.gif DELETED ---

--- heading-member.gif DELETED ---

--- heading-search-2.gif DELETED ---

--- heading-search-3.gif DELETED ---

--- heading-search.gif DELETED ---

--- hltlogo.gif DELETED ---

--- holder.gif DELETED ---

--- jigsaw.gif DELETED ---

--- koha.gif DELETED ---

--- large-print.gif DELETED ---

--- magazine.gif DELETED ---

--- map.gif DELETED ---

--- picture-book.gif DELETED ---

--- place-reserve.jpg DELETED ---

--- search-button.gif DELETED ---

--- selected-circle.gif DELETED ---

--- sm-book.gif DELETED ---

--- sm-disk.gif DELETED ---

--- sm-dvd.gif DELETED ---

--- sm-jigsaw.gif DELETED ---

--- sm-lg-print.gif DELETED ---

--- sm-picture-book.gif DELETED ---

--- sm-tape.gif DELETED ---

--- talking-book.gif DELETED ---

--- tan-dot.gif DELETED ---

--- tape.gif DELETED ---

--- vanilla-logout-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/includes crumb-end.inc,1.1,NONE crumb-start.inc,1.1,NONE home-modern.css,1.1,NONE itemtype-image.inc,1.1,NONE koha.css,1.1,NONE main.css,1.1,NONE opac.css,1.1,NONE script.js,1.1,NONE vanilla-about-menu.inc,1.1,NONE vanilla-about-menu.tmpl,1.1,NONE vanilla-botnav-all.inc,1.1,NONE vanilla-cat-search.inc,1.1,NONE vanilla-contact-menu.tmpl,1.1,NONE vanilla-crumb-end.inc,1.1,NONE vanilla-crumb-start.inc,1.1,NONE vanilla-end-main.inc,1.1,NONE vanilla-key.inc,1.1,NONE vanilla-left-nav.inc,1.1,NONE vanilla-logout.inc,1.1,NONE vanilla-main.css,1.1,NONE vanilla-member-menu.inc,1.1,NONE vanilla-membership-botnav.inc,1.1,NONE vanilla-membership-left-nav.inc,1.1,NONE vanilla-menu.inc,1.1,NONE vanilla-personal-details.inc,1.1,NONE vanilla-search-menu.inc,1.1,NONE
Message-ID: <E1CoO2S-0005uS-QY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc home-modern.css 
	itemtype-image.inc koha.css main.css opac.css script.js 
	vanilla-about-menu.inc vanilla-about-menu.tmpl 
	vanilla-botnav-all.inc vanilla-cat-search.inc 
	vanilla-contact-menu.tmpl vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing unido templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- home-modern.css DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-about-menu.inc DELETED ---

--- vanilla-about-menu.tmpl DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-contact-menu.tmpl DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/images unido-home-photos.jpg,1.1,NONE unido-logo.gif,1.1,NONE
Message-ID: <E1CoO2S-0005uJ-QP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/images

Removed Files:
      Tag: rel_2_2
	unido-home-photos.jpg unido-logo.gif 
Log Message:
removing unido templates, that are out of date

--- unido-home-photos.jpg DELETED ---

--- unido-logo.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/includes crumb-end.inc,1.2,NONE crumb-start.inc,1.2,NONE itemtype-image.inc,1.2,NONE koha.css,1.2,NONE main.css,1.2,NONE opac.css,1.2,NONE script.js,1.2,NONE vanilla-botnav-all.inc,1.2,NONE vanilla-cat-search.inc,1.2,NONE vanilla-crumb-end.inc,1.2,NONE vanilla-crumb-start.inc,1.2,NONE vanilla-end-main.inc,1.2,NONE vanilla-key.inc,1.2,NONE vanilla-left-nav.inc,1.2,NONE vanilla-logout.inc,1.2,NONE vanilla-main.css,1.3,NONE vanilla-member-menu.inc,1.2,NONE vanilla-membership-botnav.inc,1.2,NONE vanilla-membership-left-nav.inc,1.3,NONE vanilla-menu.inc,1.2,NONE vanilla-personal-details.inc,1.2,NONE vanilla-search-menu.inc,1.2,NONE
Message-ID: <E1CoO1p-0005ru-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc itemtype-image.inc koha.css 
	main.css opac.css script.js vanilla-botnav-all.inc 
	vanilla-cat-search.inc vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing vanilla templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en about.tmpl,1.2,NONE contact.tmpl,1.1,NONE opac-detail-all.tmpl,1.2,NONE opac-detail-multi.tmpl,1.1,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.6,NONE opac-search.tmpl,1.3,NONE
Message-ID: <E1CoO2S-0005uV-V4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en

Removed Files:
      Tag: rel_2_2
	about.tmpl contact.tmpl opac-detail-all.tmpl 
	opac-detail-multi.tmpl opac-detail.tmpl opac-main.tmpl 
	opac-search.tmpl 
Log Message:
removing unido templates, that are out of date

--- about.tmpl DELETED ---

--- contact.tmpl DELETED ---

--- opac-detail-all.tmpl DELETED ---

--- opac-detail-multi.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-search.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en loggedin.tmpl,1.2,NONE opac-account.tmpl,1.2,NONE opac-auth.tmpl,1.2,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.3,NONE opac-membership.tmpl,1.2,NONE opac-readingrecord.tmpl,1.2,NONE opac-reserve.tmpl,1.2,NONE opac-searchresults.tmpl,1.3,NONE opac-search.tmpl,1.2,NONE opac-userdetails.tmpl,1.2,NONE opac-user.tmpl,1.3,NONE opac-userupdate.tmpl,1.2,NONE
Message-ID: <E1CoO1q-0005ry-At@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en

Removed Files:
      Tag: rel_2_2
	loggedin.tmpl opac-account.tmpl opac-auth.tmpl 
	opac-detail.tmpl opac-main.tmpl opac-membership.tmpl 
	opac-readingrecord.tmpl opac-reserve.tmpl 
	opac-searchresults.tmpl opac-search.tmpl opac-userdetails.tmpl 
	opac-user.tmpl opac-userupdate.tmpl 
Log Message:
removing vanilla templates, that are out of date

--- loggedin.tmpl DELETED ---

--- opac-account.tmpl DELETED ---

--- opac-auth.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-membership.tmpl DELETED ---

--- opac-readingrecord.tmpl DELETED ---

--- opac-reserve.tmpl DELETED ---

--- opac-searchresults.tmpl DELETED ---

--- opac-search.tmpl DELETED ---

--- opac-userdetails.tmpl DELETED ---

--- opac-user.tmpl DELETED ---

--- opac-userupdate.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:35:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:35:30 -0800
Subject: [Koha-cvs] CVS: koha about.pl,1.4,1.4.4.1
Message-ID: <E1CoO3O-0005ym-1P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22968

Modified Files:
      Tag: rel_2_2
	about.pl 
Log Message:
correct detection of apache2 on mandrakelinux

Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** about.pl	28 Nov 2003 13:59:30 -0000	1.4
--- about.pl	11 Jan 2005 15:35:26 -0000	1.4.4.1
***************
*** 25,28 ****
--- 25,29 ----
  my $mysqlVersion = `mysql -V`;
  my $apacheVersion =  `httpd -v`;
+ $apacheVersion =  `httpd2 -v` unless $apacheVersion;
  
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:36:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:36:10 -0800
Subject: [Koha-cvs] CVS: koha bull-home.pl,1.2,1.2.2.1
Message-ID: <E1CoO42-00061v-0H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23155

Modified Files:
      Tag: rel_2_2
	bull-home.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull-home.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.pl	5 Aug 2004 16:37:07 -0000	1.2
--- bull-home.pl	11 Jan 2005 15:36:02 -0000	1.2.2.1
***************
*** 13,17 ****
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my @subscriptions = getsubscriptions($title,$ISSN);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",
--- 13,18 ----
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my $biblionumber = $query->param('biblionumber');
! my @subscriptions = getsubscriptions($title,$ISSN,$biblionumber);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",




From tipaul at users.sourceforge.net  Tue Jan 11 17:03:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:03:00 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.1,1.115.2.2
Message-ID: <E1CoOU0-0007el-HA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29334/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.1
retrieving revision 1.115.2.2
diff -C2 -r1.115.2.1 -r1.115.2.2
*** Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
--- Biblio.pm	11 Jan 2005 16:02:35 -0000	1.115.2.2
***************
*** 1806,1814 ****
          $item->{'location'},	   $item->{'itemnum'}
      );
-     if ( $item->{'barcode'} eq '' ) {
-         $item->{'notforloan'} = 0 unless $item->{'notforloan'};
-         $query = "update items set notforloan=? where itemnumber=?";
-         @bind = ( $item->{'notforloan'}, $item->{'itemnum'} );
-     }
      if ( $item->{'lost'} ne '' ) {
          $query = "update items set biblioitemnumber=?,
--- 1806,1809 ----
***************
*** 2632,2635 ****
--- 2627,2633 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.2  2005/01/11 16:02:35  tipaul
+ # in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.
+ #
  # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
  # bugfix : issn were not stored correctly in non-MARC DB on biblio modification




From tipaul at users.sourceforge.net  Tue Jan 11 17:10:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:10:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11.2.1,1.11.2.2
Message-ID: <E1CoOaz-00082r-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30879/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
1st fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=853

When I search by barcode from this page:
/cgi-bin/koha/search.marc/search.pl?type=intranet
A search for an existing barcode returns no results.  A search by call number
also returns no results.

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
--- opac-search.tmpl	11 Jan 2005 16:10:10 -0000	1.11.2.2
***************
*** 76,80 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>
--- 76,80 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>




From tipaul at users.sourceforge.net  Tue Jan 11 17:34:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:34:03 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.3.2.1
Message-ID: <E1CoOy3-00013w-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4030/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
The OPAC requires uses to log in to view virtual shelves, and it requires a user
with librarian privileges.  Virtual shelves should be viewable by all users,
logged in or not, and editable by all logged-in users in good standing.

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
***************
*** 43,47 ****
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
--- 43,47 ----
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
***************
*** 188,191 ****
--- 188,197 ----
  #
  # $Log$
+ # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
+ # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
+ # The OPAC requires uses to log in to view virtual shelves, and it requires a user
+ # with librarian privileges.  Virtual shelves should be viewable by all users,
+ # logged in or not, and editable by all logged-in users in good standing.
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Tue Jan 11 17:44:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:44:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1
Message-ID: <E1CoP7s-0001fg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6402/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:46:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:46:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 shelves.tmpl,NONE,1.1.2.1
Message-ID: <E1CoPA5-0001mS-Tr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6832/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.1.2.1,1.1.2.2 result.tmpl,1.1.2.1,1.1.2.2 subscription-detail.tmpl,1.2,1.2.2.1
Message-ID: <E1CoPH4-000264-0r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8042/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- bull-home.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:53:39 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From oleonard at users.sourceforge.net  Tue Jan 11 17:54:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:54:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.2,1.3 result.tmpl,1.2,1.3 subscription-detail.tmpl,1.2,1.3
Message-ID: <E1CoPHe-00028q-Jb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8212/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From tipaul at users.sourceforge.net  Tue Jan 11 18:41:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 09:41:54 -0800
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_225a.pl,1.8,1.8.2.1
Message-ID: <E1CoQ1i-0004oF-Ck@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18435/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Log Message:
fix to show seriestitle even for books without isbn (but with a editor, of course)

Index: unimarc_field_225a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** unimarc_field_225a.pl	23 Sep 2004 16:33:13 -0000	1.8
--- unimarc_field_225a.pl	11 Jan 2005 17:41:44 -0000	1.8.2.1
***************
*** 119,123 ****
  	# if there is an isbn, complete search
  		my @collections;
- 	if ($isbn_found) {
  		my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
  						left join auth_header on auth_subfield_table.authid=auth_header.authid 
--- 119,122 ----
***************
*** 135,146 ****
  			}
  		}
- 	} else {
- 	# if there is no isbn, search with %
- 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib");
- 		$sth->execute("\%$authoritysep $editor_found $authoritysep");
- 		while (my ($line)= $sth->fetchrow) {
- 			push @collections,$line;
- 		}
- 	}
  #	my @collections = ["test"];
  	my $collection =CGI::scrolling_list(-name=>'f1',
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 19:33:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:33:46 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes popup-bottom.inc,NONE,1.1.2.1 popup-top.inc,NONE,1.1.2.1
Message-ID: <E1CoQpu-0007ZH-N0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29081/koha-tmpl/opac-tmpl/css/en/includes

Added Files:
      Tag: rel_2_2
	popup-bottom.inc popup-top.inc 
Log Message:
missing files

--- NEW FILE ---
</body>
</html>

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
	<title>popup</title>
	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
	<!-- TMPL_IF name="opacstylesheet" -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
	<!-- TMPL_ELSE -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
	<!-- /TMPL_IF -->
</head>

<body>
<!-- NO MENUS for popup-top -->




From tipaul at users.sourceforge.net  Tue Jan 11 19:34:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:34:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes basket.js,1.3,1.3.2.1
Message-ID: <E1CoQr1-0007dd-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29346/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/basket.js,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** basket.js	8 Dec 2004 10:27:10 -0000	1.3
--- basket.js	11 Jan 2005 18:34:52 -0000	1.3.2.1
***************
*** 358,360 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 21:18:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 12:18:33 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.1,1.3.2.2
Message-ID: <E1CoSTJ-0005kR-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22081/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
--- opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};		
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
  # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :




From oleonard at users.sourceforge.net  Tue Jan 11 23:47:27 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:47:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.1.2.1
Message-ID: <E1CoUnP-0005gE-AI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21793/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding checkall() and confirmdelete() functions for use in virtual shelves

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
***************
*** 39,40 ****
--- 39,62 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 23:48:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:48:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images checkall.gif,NONE,1.1.2.1
Message-ID: <E1CoUoZ-0005lw-JJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22157/koha-tmpl/opac-tmpl/npl/en/images

Added Files:
      Tag: rel_2_2
	checkall.gif 
Log Message:
Adding checkall graphic for use in results lists

--- NEW FILE ---
GIF89a



From oleonard at users.sourceforge.net  Tue Jan 11 23:49:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:49:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1,1.1.2.1
Message-ID: <E1CoUpq-0005zk-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23003/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Many changes to appearance and functionality of virtual shelves

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-shelves.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
***************
*** 5,163 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
      <table>
      		<tr>
! 			<th colspan="4">
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
  		</tr>
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
  	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<!-- TMPL_IF name="manageshelf" -->
! 		<input type="submit" value="Remove Selected Items" class="submit">
! 	<!-- /TMPL_IF -->
! </form>
! <!-- TMPL_IF name="manageshelf" -->
! <form>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<table>
  		<tr>
! 			<td>
! 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
! 			</td>
! 			<td>
! 				<input name="addbarcode">
! 				<input type="hidden" name="modifyshelfcontents" value="1">
! 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 				<input type="submit" value="Save" class="submit">
! 			</td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		
! 		<h1>Bookshelves</h1>
! 		<table border="0" cellpadding="7">
! 			<tr>
! 				<td align="center" valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 						</p>
  					</form>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value=1>
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 					<p>
! 						<input type="submit" value="Delete Shelves" class="submit"></form>
! 					</p>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>
! 								<font color="white">Add Shelf</font>
! 							</th>
! 						</tr>
! 						<tr>
! 							<td>
! 								<p>Name : <input type="text" name="addshelf" size="25"></p>
! 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
! 								<p>Category : <select name="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select>
! 								</p>
! 								<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 									<li> A public can be seen by everybody, but managed only by you.</li>
! 									<li> A free can be managed by any user.</li>
! 								</p>
! 							</td>
! 						</tr>
! 					</table>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
! 
  	<!-- TMPL_ELSE -->
! 		
! 		<table>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<P>
! 			<a href="opac-shelves.pl?shelves=1" class="submit">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  </body>
--- 5,133 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
+ 	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
      		<tr>
! 			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><th>Barcode</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
  		</tr>
+ 		<!-- TMPL_IF NAME="itemsloop" -->
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
! 	<input type="hidden" name="modifyshelfcontents" value="1" />
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
! 					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
! 					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 					<td><!-- TMPL_VAR NAME="classification" --></td>
! 					<td><!-- TMPL_VAR Name="barcode" --></td>
! 		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
! 		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
! <br /><br />
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
  	<table>
+ 		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
  		<tr>
! 			<td><label for="addbarcode">Barcode:</label></td>
! 			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" class="submit" /></td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
+ <form class="inline" method="get" action="opac-shelves.pl"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="error"><!-- TMPL_VAR Name="string1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="error"><!-- TMPL_VAR Name="string" --></p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! <div id="center">
! <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
! 		<input type="hidden" name="shelves" value="1">
! 		<table>
! 		<caption>Create a New a Virtual Shelf</caption>
! 		<tr><td><label for="addshelf">Shelf Name:</label> </td><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
! 		<tr><td><label for="owner">Owner:</label> </td><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
! 		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select></td></tr></table>
! 		<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
! 			<li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
  					</form>
! 				</div>		
! 		
! 		<div id="right"><!-- TMPL_IF NAME="shelvesloop" -->
! 		<form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
! 					<input type="hidden" name="shelves" value="1" />
! 					<table>
! 					<caption>Delete Virtual Shelves</caption>
! 						<tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 		<input type="submit" value="Delete Shelves" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! 		<p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form></p>
! </div>
  	<!-- TMPL_ELSE -->
! 	<!-- TMPL_IF name="edit" -->
! 		<form method="post">
! 			<input type="hidden" name="op" value="modifsave">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
! 			<table>
! 			<caption>Modify Virtual Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
! 			<tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
! 			<tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
! 			<tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
! 					<!-- TMPL_IF name="category1" -->
! 						<option value="1" selected>Private</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="1">Private</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category2" -->
! 						<option value="2" selected>Public</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="2">Public</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category3" -->
! 						<option value="3" selected>Free</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="3">Free</option>
! 					<!-- /TMPL_IF -->
! 				</select></td></tr>
! 			</table>
! 			<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
! 				<li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
! 				<li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
! 			<p><input type="submit" value="Save Changes" class="submit"></p>
! 
! 		</form>
! <!-- /TMPL_IF -->
! <table>
! <caption>Virtual Shelves</caption>
! <tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
! <!-- TMPL_LOOP Name="shelvesloop" -->
! <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" class="submit" /></form></p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <br clear="both" />
  </div>
  </body>




From oleonard at users.sourceforge.net  Wed Jan 12 18:00:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:00:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.30.2.1
Message-ID: <E1Colrd-0001wb-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:00:52 -0000	1.30.2.1
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:02:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:02:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.31
Message-ID: <E1Colt1-00022g-2Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7838/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:02:20 -0000	1.31
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:46:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:46:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.2.2.1
Message-ID: <E1Coma8-0004ko-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18191/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:46:40 -0000	1.2.2.1
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:47:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:47:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.3
Message-ID: <E1Comav-0004oI-Ml@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18460/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:47:30 -0000	1.3
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:18:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:18:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.6.2.1
Message-ID: <E1CoowY-0004tW-H1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18742/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:19:05 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:19:05 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.7
Message-ID: <E1CooxN-0004wf-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18951/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.2
Message-ID: <E1Cop1n-0005Fb-IZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20148/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:36 -0000	1.2
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:03 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.1.2.1
Message-ID: <E1Cop1D-0005D9-8Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19981/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:00 -0000	1.1.2.1
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 22:34:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:34:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.6.2.1
Message-ID: <E1Coq8F-0001Fp-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4752/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:34:18 -0000	1.6.2.1
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From oleonard at users.sourceforge.net  Wed Jan 12 22:37:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:37:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.7
Message-ID: <E1CoqB5-0001VL-5Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5730/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:37:09 -0000	1.7
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From acli at users.sourceforge.net  Thu Jan 13 07:01:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 22:01:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6,1.6.2.1 opac-top.inc,1.8,1.8.2.1
Message-ID: <E1Coy3T-0003sN-EU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14334

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
We need the http-equiv headers for non-iso8859-1 translations.
(Arguably it's a bug in tmpl_process3, but HTML::Mason needs it; it is
easier to fix it here.)


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** opac-basket-top.inc	24 Nov 2004 16:08:55 -0000	1.6
--- opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
***************
*** 5,8 ****
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
--- opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
***************
*** 10,13 ****
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:22:38 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:22:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16,1.16.2.1
Message-ID: <E1CozJW-0006vS-Mn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26533

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Added http-equiv tag for non-iso-8859-1 charset support.  See bug 885.


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
--- opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
***************
*** 9,12 ****
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6.2.1,1.6.2.2 opac-top.inc,1.8.2.1,1.8.2.2
Message-ID: <E1Cozal-0007ez-DM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/includes

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
XML requires />


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
--- opac-basket-top.inc	13 Jan 2005 07:40:24 -0000	1.6.2.2
***************
*** 5,9 ****
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
--- opac-top.inc	13 Jan 2005 07:40:24 -0000	1.8.2.2
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.1,1.16.2.2
Message-ID: <E1Cozal-0007ex-BU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
XML requires />


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
--- opac-main.tmpl	13 Jan 2005 07:40:24 -0000	1.16.2.2
***************
*** 9,13 ****
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k9-II@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/fr/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvsHL2p76 and /tmp/cvsHehDJB differ




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k4-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/en/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvs5zEiwO and /tmp/cvsDnxCOi differ




From oleonard at users.sourceforge.net  Thu Jan 13 18:55:26 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:26 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help - New directory
Message-ID: <E1Cp9Bu-0005Pg-12@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20793/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities - New directory
Message-ID: <E1Cp9C7-0005Qb-9F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull - New directory
Message-ID: <E1Cp9C7-0005Qe-Fn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members - New directory
Message-ID: <E1Cp9C7-0005Qh-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/members

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc - New directory
Message-ID: <E1Cp9C7-0005Qk-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/search.marc

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin - New directory
Message-ID: <E1Cp9C7-0005QY-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/admin

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005X1-Ns@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
	authorities.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1 nohelp.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XC-D2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1 statecollection.tmpl,NONE,1.1 subscription-add.tmpl,NONE,1.1 subscription-detail.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XD-D5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XH-Dz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1 biblio_framework.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005Wx-36@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XN-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
	search.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 19:36:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:36:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.2 401.pl,1.1,1.2 402.pl,1.1,1.2 403.pl,1.1,1.2 404.pl,1.1,1.2 500.pl,1.1,1.2
Message-ID: <E1Cp9pH-0007fw-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29420/koha-tmpl/errors

Modified Files:
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 19:37:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:37:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.1.2.1 401.pl,1.1,1.1.2.1 402.pl,1.1,1.1.2.1 403.pl,1.1,1.1.2.1 404.pl,1.1,1.1.2.1 500.pl,1.1,1.1.2.1
Message-ID: <E1Cp9qg-0007ka-7F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29755/koha-tmpl/errors

Modified Files:
      Tag: rel_2_2
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 20:13:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:13:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CpAPI-0001LB-TS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5061/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:14:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:14:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.1.2.1 401.tmpl,1.1,1.1.2.1 402.tmpl,1.1,1.1.2.1 403.tmpl,1.1,1.1.2.1 404.tmpl,1.1,1.1.2.1 405.tmpl,1.1,1.1.2.1 500.tmpl,1.1,1.1.2.1
Message-ID: <E1CpAQe-0001PO-Rx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:41:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:41:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors - New directory
Message-ID: <E1CpAqs-0002nD-W8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10726/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 20:42:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:42:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1 401.tmpl,NONE,1.1 402.tmpl,NONE,1.1 403.tmpl,NONE,1.1 404.tmpl,NONE,1.1 405.tmpl,NONE,1.1 500.tmpl,NONE,1.1
Message-ID: <E1CpArh-0002pn-Gx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10872/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 20:47:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:47:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1.2.1 401.tmpl,NONE,1.1.2.1 402.tmpl,NONE,1.1.2.1 403.tmpl,NONE,1.1.2.1 404.tmpl,NONE,1.1.2.1 405.tmpl,NONE,1.1.2.1 500.tmpl,NONE,1.1.2.1
Message-ID: <E1CpAvu-00033Z-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11722/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 21:21:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:21:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint - New directory
Message-ID: <E1CpBTU-0005J7-Cl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20362/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint added to the repository
--> Using per-directory sticky tag `rel_2_2'





From oleonard at users.sourceforge.net  Thu Jan 13 21:22:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:22:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,NONE,1.1.2.1
Message-ID: <E1CpBU4-0005MK-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20589/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
      Tag: rel_2_2
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME=allsub-p -->
<table>
<caption>Results</caption>
<!-- TMPL_LOOP NAME="loop" -->
<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
<table>
<caption>Subject Heading Global Update</caption>
<tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
</table>
<input type="submit" value="Modify" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Successfully modified <!-- TMPL_VAR NAME="oldsub" escape=html -->
is now <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table>
<thead>
<tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Undelete</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
<h3>Succesfully undeleted</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<table>
<tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
<input type="hidden" name="type" value="updatetype" />
<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
</table>
<input type="submit" value="Change" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
<h3>Updated successfully</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<div class="menu">
<h1>Catalog Maintenance</h1>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Subject Maintenance</caption>
<tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/search.pl" method="post">
<table>
<caption>Group Maintenance</caption>
<tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
<tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Undelete Biblio</caption>
<tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>
</div>
<!-- /TMPL_IF -->

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:24:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:24:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.3,1.4
Message-ID: <E1CpBVp-0005VF-2F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21139/koha-tmpl/intranet-tmpl/npl/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.tmpl	19 Jul 2004 20:13:59 -0000	1.3
--- catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
***************
*** 1,9 ****
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
--- 1,15 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
+ <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
+ <table>
+ <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
+ </table>
  <!-- /TMPL_IF -->
  
***************
*** 11,20 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
- <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
--- 17,28 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
***************
*** 31,38 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
- <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 39,45 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 47,52 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
--- 54,59 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
***************
*** 54,61 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
--- 61,70 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
***************
*** 63,95 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
--- 72,110 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
+ </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:27:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:27:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.4,1.5
Message-ID: <E1CpBYu-0005jB-08@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21998/koha-tmpl/intranet-tmpl/default/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Replacing default template accidentally overwritten with NPL one

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
--- catmaintain.tmpl	13 Jan 2005 20:27:16 -0000	1.5
***************
*** 1,15 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
- <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
- <table>
- <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
- </table>
  <!-- /TMPL_IF -->
  
--- 1,9 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
***************
*** 17,28 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
--- 11,20 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
+ <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
***************
*** 39,45 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 31,38 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
+ <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 54,59 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
--- 47,52 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
***************
*** 61,70 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
--- 54,61 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
***************
*** 72,110 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
- </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 63,95 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:36:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:36:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,1.1,1.2
Message-ID: <E1CpBhp-0006Ia-Cy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24204/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte





From oleonard at users.sourceforge.net  Thu Jan 13 21:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:41:11 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.4
Message-ID: <E1CpBmJ-0006cd-5V@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25432/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};				
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.4  2005/01/13 20:41:07  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Thu Jan 13 21:46:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:46:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion - New directory
Message-ID: <E1CpBrn-00071e-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26941/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 21:48:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:48:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1 mail_suggestion_ORDERED.tmpl,NONE,1.1 mail_suggestion_REJECTED.tmpl,NONE,1.1
Message-ID: <E1CpBtV-0007Am-T1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27533/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 21:56:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:56:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1.2.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1.2.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1.2.1 mail_suggestion_ORDERED.tmpl,NONE,1.1.2.1 mail_suggestion_REJECTED.tmpl,NONE,1.1.2.1
Message-ID: <E1CpC1b-0007ld-4O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
      Tag: rel_2_2
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:48:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:48:54 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.3 members-home.pl,1.1,1.2
Message-ID: <E1CpCpq-0002Y9-5q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9792/members

Modified Files:
	member.pl members-home.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	13 Jan 2005 21:48:49 -0000	1.3
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	13 Jan 2005 21:48:50 -0000	1.2
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 22:50:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:50:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpCrO-0002fe-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10258/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:53:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:53:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.4
Message-ID: <E1CpCtu-0002qK-N1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10913/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 23:39:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:39:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1
Message-ID: <E1CpDct-0005fe-He@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.16,1.17
Message-ID: <E1CpDeM-0005lv-QJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22173/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** request.tmpl	26 Nov 2004 20:47:06 -0000	1.16
--- request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post" name="request">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
***************
*** 22,26 ****
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
--- 22,26 ----
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="openWindow('/cgi-bin/koha/members/members-home.pl?quicksearch=1', 'newwin'); return false;">(Quick Search)</a></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
***************
*** 149,151 ****
--- 149,162 ----
  	<!-- /TMPL_IF -->
  </div>
+ <script language="javascript" type="text/javascript">
+ 	// Set the value of the form field to the passed value and optionally shift
+ 	// focus and close the popup.
+ 	function FillForm(val,formname,formfield) {
+ 		document.forms[formname].elements[formfield].value = val;
+ 		// Uncomment below to shift focus after clicking link in popup.
+ 		document.forms[formname].elements[formfield].focus();
+ 		// Uncomment below to close popup after clicking link.
+ 		newwin.close();
+ 	}
+ </script>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpDfB-0005o6-Jx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22310/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From shedges at users.sourceforge.net  Fri Jan 14 00:56:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 15:56:51 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr/sysadmin/migration migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CpEpf-0001i3-CC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/sysadmin/migration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557

Added Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml and move to migration directory

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Paramétrer et migrer ses données vers Koha 2.2</title>

  <articleinfo>
    <pubdate>2005-01-06</pubdate>

    <author>
      <firstname>Paul</firstname>

      <surname>POULAIN</surname>

      <authorblurb>
        <para>Consultant indépendant en logiciels libres, Koha "Release
        Manager" pour la version 2.0 puis 2.2, membre du comité de pilotage
        international</para>
      </authorblurb>
[...1229 lines suppressed...]
  '011','','',
  'a' =&gt; $resul{ISSN},
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>

        <para>Notez que le code qui précède ne traite pas des notices
        d'exemplaire (là, c'est vraiment trop spécifique)</para>
      </section>
    </section>
  </section>
</article>



From shedges at users.sourceforge.net  Fri Jan 14 01:00:09 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 16:00:09 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.1,1.2
Message-ID: <E1CpEsr-0001tY-KC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7189

Modified Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml (moved to migration subdirectory)

Index: migrer_ses_donnees.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/fr/migrer_ses_donnees.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** migrer_ses_donnees.xml	6 Jan 2005 15:25:36 -0000	1.1
--- migrer_ses_donnees.xml	13 Jan 2005 23:59:54 -0000	1.2
***************
*** 1,89 ****
! <?xml version="1.0" encoding="ISO-8859-15"?>
! <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
! <book>
!   <title>Param�trer et migrer ses donn�es vers Koha 2.2</title>
  
!   <chapter>
      <title>Introduction</title>
  
!     <articleinfo><pubdate>2002-01-06</pubdate> <author>
[...2041 lines suppressed...]
  
!         <para>Notez que le code qui pr�c�de ne traite pas des notices
!         d'exemplaire (l�, c'est vraiment trop sp�cifique)</para>
        </section>
      </section>
!   </chapter>
! </book>
\ No newline at end of file
--- 1259,1268 ----
  );
  $newRecord-&gt;insert_fields_ordered($newField);
! my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>
  
!         <para>Notez que le code qui précède ne traite pas des notices
!         d'exemplaire (là, c'est vraiment trop spécifique)</para>
        </section>
      </section>
!   </section>
! </article>
\ No newline at end of file




From oleonard at users.sourceforge.net  Fri Jan 14 16:41:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:41:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1.2.1 nohelp.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTa1-0008IT-54@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31882/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
      Tag: rel_2_2
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lg-Ua@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1.2.1 statecollection.tmpl,NONE,1.1.2.1 subscription-add.tmpl,NONE,1.1.2.1 subscription-detail.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LR-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
      Tag: rel_2_2
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N�2004/1, N�2004/2, N�2004/3, N�2004/4, N�2005/1, N�2005/2, N�2005/3, N�2005/4, N�2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N�{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N�2004/1,N�2004/2,N�2004/3,N�2004/4,N�2005/1,N�2005/2,N�2005/3,N�2005/4,N�2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1.2.1 authorised_values.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 branches.tmpl,NONE,1.1.2.1 categorie.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 koha2marclinks.tmpl,NONE,1.1.2.1 marc_subfields_structure.tmpl,NONE,1.1.2.1 marctagstructure.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LN-A3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
      Tag: rel_2_2
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1.2.1 members-home.tmpl,NONE,1.1.2.1 moremember.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lc-Qa@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
      Tag: rel_2_2
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTav-0008LM-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
      Tag: rel_2_2
	authorities.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Fri Jan 14 22:08:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.3 newimember.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 newmember.tmpl,1.1,1.2
Message-ID: <E1CpYg8-000216-Rd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7721/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	14 Jan 2005 21:08:16 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:08:48 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.2,1.3 newbasket2.tmpl,1.1,1.2 order.tmpl,1.2,1.3 recieve.tmpl,1.1,1.2 recieveorder.tmpl,1.1,1.2 supplier.tmpl,1.1,1.2
Message-ID: <E1CpYga-000236-8R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7842/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:09:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:09:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.3
Message-ID: <E1CpYh4-00025c-3x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8006/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
	marcimport.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	14 Jan 2005 21:09:09 -0000	1.3
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:10:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:10:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CpYhs-0002Bf-To@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:44:09 -0000	1.1
--- addbookbybiblionumber.tmpl	14 Jan 2005 21:10:04 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Fri Jan 14 22:16:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:16:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.3,1.4 search.tmpl,1.2,1.3 searchresultlist.tmpl,1.1,1.2 subscription-bib-search.tmpl,1.1,1.2
Message-ID: <E1CpYnq-0002XY-Lh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9754/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
--- result.tmpl	14 Jan 2005 21:16:14 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- search.tmpl	14 Jan 2005 21:16:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:17:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:17:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.3
Message-ID: <E1CpYp6-0002ba-Vl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9984/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	branchtransfers.tmpl 
Log Message:
Converting popup links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	14 Jan 2005 21:17:33 -0000	1.3
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Fri Jan 14 22:19:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:19:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.3 doc-head-close-addbiblio.inc,1.1,1.2 doc-head-close.inc,1.1,1.2
Message-ID: <E1CpYql-0002im-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10440/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	14 Jan 2005 21:19:15 -0000	1.3
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Fri Jan 14 22:23:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:23:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes main-top.inc,1.3,NONE
Message-ID: <E1CpYuS-0002vL-7T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11232/koha-tmpl/intranet-tmpl/npl/en/includes

Removed Files:
	main-top.inc 
Log Message:
Removing main-top.inc.  Other includes are used in its place (doc-head-open.inc and doc-head-close.inc)

--- main-top.inc DELETED ---




From oleonard at users.sourceforge.net  Fri Jan 14 22:33:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:33:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.2
Message-ID: <E1CpZ4G-0003Pp-AL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13110/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categoryitem.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	14 Jan 2005 21:33:12 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:34:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:34:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.2 modbib.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2
Message-ID: <E1CpZ5d-0003UY-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13394/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From acli at users.sourceforge.net  Sat Jan 15 06:51:37 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Fri, 14 Jan 2005 21:51:37 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.23,1.23.2.1
Message-ID: <E1CpgqX-0002h0-P4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9389

Modified Files:
      Tag: rel_2_2
	buildrelease 
Log Message:
Taught buildrelease what the misc directory and release 2.2 is, and also
that version numbers might only have 1 dot. This should fix bugs 889, 890.

A --verbose or -v option has been added in the process of doing the above.

It now chdir to .. if it discovers that it is being run inside misc, since
running it inside misc screws up various things, and I never remember
whether it should be run inside misc or not.

A confirmation message about whether to tag or not is now displayed after
the user answers the question about tagging. I have never felt safe not
having the release builder confirm with me that I really am not tagging
anything.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** buildrelease	5 Jan 2005 14:31:06 -0000	1.23
--- buildrelease	15 Jan 2005 05:51:35 -0000	1.23.2.1
***************
*** 1,4 ****
--- 1,60 ----
  #!/usr/bin/perl
+ # This script uses standard 8-space tabs with 4-space indents
+ # vi users can :set sw=4 ai sm
  
+ use Getopt::Long;
+ use vars qw( $verbose_p );
+ 
+ GetOptions(
+     'verbose|v' => \$verbose_p,
+ ) || exit(1);
+ 
+ print <<EOM;
+ ***************************************
+ * Welcome to the Koha Release Builder *
+ ***************************************
+ EOM
+ 
+ #----------------------------------------------------------
+ # To guess the version, we need to first guess where this
+ # script itself is Otherwise we will have different results
+ # depending on whether the script is called as ./buildrelease
+ # or misc/buildrelease. If we run the script from misc, we
+ # will also get errors from "cvs update" later, so this is
+ # rather important information
+ #----------------------------------------------------------
+ print STDERR "Perl reports that buildrelease is $0\n" if $verbose_p;
+ my $self_path;
+ if ($0 =~ /^(\.\/)*buildrelease$/) {
+     $self_path = 'buildrelease';
+ } elsif ($0 =~ /^(?:(\.\/)*\/)?misc\/buildrelease$/) {
+     $self_path = 'misc/buildrelease';
+ } else {
+     print <<EOM;
+ 
+ WARNING: Unable to determine where the buildrelease script is located.
+          The version number guessed by the next step might be wrong.
+ EOM
+     $self_path = (-f 'buildrelease')? 'buildrelease': 'misc/buildrelease';
+ }
+ print STDERR "Assuming buildrelease is $self_path\n" if $verbose_p;
+ 
+ #----------------------------------------------------------
+ # Fixup the current directory
+ #----------------------------------------------------------
+ if ($self_path eq 'buildrelease') {
+     print <<EOM;
+ 
+ WARNING: You should run the buildrelease script from the top of the koha
+          CVS module.  I will try to change to the correct directory, but
+          it is better if you had ran this script there in the first place.
+ EOM
+     chdir ".." || die "..: chdir: $!\n";
+     $self_path = 'misc/buildrelease';
+ }
+ 
+ #----------------------------------------------------------
+ # Start the release builder
+ #----------------------------------------------------------
  #sub guess_kohahtmldir ($;$);
  #----------------------------------------------------------
***************
*** 14,17 ****
--- 70,74 ----
  
  if (-e "$roothomedir/.kohaautobuild.conf") {
+     print STDERR "$roothomedir/.kohaautobuild.conf found\n" if $verbose_p;
      open C, "<$roothomedir/.kohaautobuild.conf";
      while (<C>) {
***************
*** 30,37 ****
  
  print qq |
- ***************************************
- * Welcome to the Koha Release Builder *
- ***************************************
- 
  This script will automatically build a release tarball.
  
--- 87,90 ----
***************
*** 39,45 ****
  out for the release that you want to build, although it will update the modules
  before building.
- 
  |;
! print "\nWhere is the 'koha' cvs module located [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
--- 92,97 ----
  out for the release that you want to build, although it will update the modules
  before building.
  |;
! print "\nWhere is the 'koha' cvs module located? [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
***************
*** 62,72 ****
  #kohahtmldir=$kohahtmldir
  |;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print "\n\nGuessing at next release version.  You may need to enter your SourceForge password...\n";
  chdir $kohadir;
! open (CVSLOG, "cvs log misc/buildrelease|");
  my $symbolicnamessection=0;
  my $symbolicnames;
--- 114,128 ----
  #kohahtmldir=$kohahtmldir
  |;
+ print STDERR "$roothomedir/.kohaautobuild.conf written\n" if $verbose_p;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print <<EOM;
! 
! Guessing the next release version. You may need to enter your SourceForge password.
! EOM
  chdir $kohadir;
! open (CVSLOG, "cvs log $self_path|");
  my $symbolicnamessection=0;
  my $symbolicnames;
***************
*** 79,97 ****
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/R_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id=~s/-/\./g;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 135,156 ----
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
+ 	print STDERR "Scanning symbolic names from cvs output\n" if $verbose_p;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/(?:R|rel)_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id =~ s/[-_]/\./g;
! 	    print STDERR "Found a tag for release $id\n" if $verbose_p;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 99,109 ****
  		    $released=0;
  		    $highestrc=$rc;
  		}
  	    } else {
  		$version=$id;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 158,170 ----
  		    $released=0;
  		    $highestrc=$rc;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    } else {
  		$version=$id;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 111,117 ****
--- 172,180 ----
  		    $released=1;
  		    $highestrc=0;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    }
  	    $symbolicnames->{$version}->{$rc}=1;
+ 	    print STDERR "Setting symbolic name mapping for version $version $rc to 1\n" if $verbose_p;
  	}
      }
***************
*** 121,143 ****
  my $currentversion='';
  
! my $branchdata=`grep buildrelease CVS/Entries`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! 
! if ($branch eq 'Trel-1-2') {
!     $highestversion=$majorversion->{'1.2'};
!     $highestrc=$majorversionrc->{'1.2'};
      ($highestrc) ? ($released=0) : ($released=1);
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     $components[$#components]++;
!     $nexthighestversion=join '.', @components;
!     my $minornumber=(split(/\./, $highestversion))[1];
!     if ($minornumber/2 == int($minornumber/2)) {
! 	$releaseversion=$nexthighestversion."RC1";
      } else {
! 	$releaseversion=$nexthighestversion;
      }
      $currentversion=$highestversion;
--- 184,219 ----
  my $currentversion='';
  
! my $cvs_entries_path = $self_path;
! $cvs_entries_path =~ s/[^\/]+$/CVS\/Entries/;
! print STDERR "Assuming CVS/Entries is $cvs_entries_path\n" if $verbose_p;
! 
! my $branchdata=`grep buildrelease $cvs_entries_path`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! $branch =~ s/^T//;
! $branch =~ s/^(?:R|rel)_//;
! $branch =~ s/[-_]/./g;
! print STDERR "Detected branch $branch\n" if $verbose_p;
! 
! if ($branch =~ /\S/ && defined $majorversion->{$branch}) {
!     $highestversion=$majorversion->{$branch};
!     $highestrc=$majorversionrc->{$branch};
      ($highestrc) ? ($released=0) : ($released=1);
+     print STDERR "Using highest version for branch $branch\n" if $verbose_p;
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     if (@components < 3) { # if it's something like just 2.2 or 2.4
! 	$releaseversion = $highestversion.".1RC1";
      } else {
! 	$components[$#components]++;
! 	$nexthighestversion=join '.', @components;
! 	my $minornumber=(split(/\./, $highestversion))[1];
! 	if ($minornumber/2 == int($minornumber/2)) {
! 	    $releaseversion=$nexthighestversion."RC1";
! 	} else {
! 	    $releaseversion=$nexthighestversion;
! 	}
      }
      $currentversion=$highestversion;
***************
*** 155,159 ****
      print "\nWould you like to rebuild the $currentversion tarball?  Y/[N]: ";
      chomp($input = <STDIN>);
-     print STDERR "releaseversion=($releaseversion), currentversion=($currentversion)\n";#XXXZZZ
      if ($input =~ /^y/i) {
  	$releaseversion=$currentversion;
--- 231,234 ----
***************
*** 178,185 ****
  chomp ($input=<STDIN>);
  my $cvstag=0;
- # FIXME: This means anything other than n will tag; too dangerous?
  if ($input=~/^y/i) {
      $cvstag=1;
  }
  
  
--- 253,260 ----
  chomp ($input=<STDIN>);
  my $cvstag=0;
  if ($input=~/^y/i) {
      $cvstag=1;
  }
+ print "The CVS repository ",($cvstag?"WILL BE TAGGED\n":"will not be tagged\n");
  
  
***************
*** 329,332 ****
--- 404,408 ----
  
  
+ # Given two version numbers (v1, v2), returns 0 if v1 <= v2, or 1 if v1 > v2
  sub versioncompare {
      my $v1=shift;




From oleonard at users.sourceforge.net  Tue Jan 18 18:35:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 09:35:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-auth.tmpl,1.1,1.1.2.1 opac-main.tmpl,1.3,1.3.2.1
Message-ID: <E1CqxGp-0007Jf-Or@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28083/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-main.tmpl 
Log Message:
Removing NPL-specific javascript function which was trying to validate library card numbers

Index: opac-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-auth.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-auth.tmpl	18 Jan 2005 17:35:51 -0000	1.1.2.1
***************
*** 35,39 ****
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid" onblur="ValidateCode();"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>
--- 35,39 ----
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-main.tmpl	8 Dec 2004 16:12:17 -0000	1.3
--- opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
***************
*** 12,16 ****
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" onblur="ValidateCode();" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>
--- 12,16 ----
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>




From oleonard at users.sourceforge.net  Tue Jan 18 21:09:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 12:09:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.4,1.5
Message-ID: <E1Cqzfh-0007io-9K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29568/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
--- request.tmpl	18 Jan 2005 20:09:28 -0000	1.5
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:10:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:10:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.2.2.1 doc-head-close-addbiblio.inc,1.1,1.1.2.1 doc-head-close.inc,1.1,1.1.2.1
Message-ID: <E1Cr0cs-0002XC-Qu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9555/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	18 Jan 2005 21:10:15 -0000	1.2.2.1
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Tue Jan 18 22:16:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:16:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.3.2.1
Message-ID: <E1Cr0iE-0002lc-O0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10542/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	18 Jan 2005 21:16:24 -0000	1.3.2.1
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:22:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:22:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.1.2.1 modbib.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.1,1.1.2.1 updatebiblio.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr0nf-000345-OM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:38:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:38:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.1.2.2,1.1.2.3 search.tmpl,1.1.2.1,1.1.2.2 searchresultlist.tmpl,1.1,1.1.2.1 subscription-bib-search.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr13x-0003si-LN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14728/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
--- result.tmpl	18 Jan 2005 21:38:04 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Tue Jan 18 22:55:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:55:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1Js-0004nJ-BT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18387/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Tue Jan 18 22:57:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:57:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1La-0004sQ-Oc@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18688/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:59:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:59:16 -0800
Subject: [Koha-cvs] CVS: koha/members members-home.pl,1.1,1.1.2.1
Message-ID: <E1Cr1Nc-0004yv-Rw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19123/members

Modified Files:
      Tag: rel_2_2
	members-home.pl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	18 Jan 2005 21:59:09 -0000	1.1.2.1
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Tue Jan 18 23:07:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:07:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1.2.1
Message-ID: <E1Cr1Vr-0005KP-5g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20451/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
      Tag: rel_2_2
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Tue Jan 18 23:11:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:11:59 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.2.2.1
Message-ID: <E1Cr1Zv-0005Z4-DY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21337/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	18 Jan 2005 22:11:43 -0000	1.2.2.1
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');




From oleonard at users.sourceforge.net  Tue Jan 18 23:53:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:53:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1 auth_tag_structure.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1
Message-ID: <E1Cr2Dk-0007jK-Cf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29639/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan 19 18:17:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:17:32 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_subfields_structure.pl,1.3,1.3.2.1 marc_subfields_structure.pl,1.32,1.32.2.1
Message-ID: <E1CrJSW-0006Sl-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24771/admin

Modified Files:
      Tag: rel_2_2
	auth_subfields_structure.pl marc_subfields_structure.pl 
Log Message:
fix for #902 (it's impossible to set the subfield 400$0)

Index: auth_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** auth_subfields_structure.pl	10 Jun 2004 08:58:34 -0000	1.3
--- auth_subfields_structure.pl	19 Jan 2005 17:17:08 -0000	1.3.2.1
***************
*** 200,204 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 200,204 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
***************
*** 282,286 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 282,286 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];




From tipaul at users.sourceforge.net  Wed Jan 19 18:24:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:24:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.22.2.1
Message-ID: <E1CrJZ6-0006s1-Uz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26371/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
removing 2 useless columns

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
***************
*** 255,261 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Upper Age Limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Age Required</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Fine</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Overdue</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Issue limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Reserve</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
--- 255,259 ----
***************
*** 270,274 ****
  				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
  				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
- 				<td><!-- TMPL_VAR NAME="finetype" --></td>
  				<td><!-- TMPL_IF NAME="overduenoticerequired" -->
  						<i>Yes</i>
--- 268,271 ----
***************
*** 277,281 ****
  					<!-- /TMPL_IF -->
  				</td>
- 				<td><!-- TMPL_VAR NAME="issuelimit" --></td>
  				<td><!-- TMPL_VAR NAME="reservefee" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
--- 274,277 ----




From tipaul at users.sourceforge.net  Wed Jan 19 18:32:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:32:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters auth_tag_structure.tmpl,1.2,1.2.2.1
Message-ID: <E1CrJhH-0007I7-Vk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27964/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
in authority structure, trying to delete a tag in an authority type, deleted the tag in the default authority type.


Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.tmpl	19 Jul 2004 19:19:54 -0000	1.2
--- auth_tag_structure.tmpl	19 Jan 2005 17:32:31 -0000	1.2.2.1
***************
*** 89,92 ****
--- 89,93 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed">
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Wed Jan 19 18:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:40:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1CrJov-0007fM-Iw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29449/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Fixing typo: nested TMPL_VAR tag that would cause internal server error

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
--- member.tmpl	19 Jan 2005 17:40:33 -0000	1.4.2.2
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Wed Jan 19 18:44:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:44:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.1.2.1
Message-ID: <E1CrJsA-0007qn-Sw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30092/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Removing non-functional renew link

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
- <th>Status</th>
  </tr>
  
--- 86,89 ----
***************
*** 97,107 ****
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
- <td>
- <!-- TMPL_IF NAME="status" -->
- <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
- <!-- TMPL_ELSE -->
- Not renewable
- <!-- /TMPL_IF -->
- </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,99 ----




From oleonard at users.sourceforge.net  Wed Jan 19 22:18:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:18:10 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.15
Message-ID: <E1CrNDO-0001oA-GL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6934/opac

Modified Files:
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	19 Jan 2005 21:18:06 -0000	1.15
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Wed Jan 19 22:22:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:22:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.2
Message-ID: <E1CrNH7-00026r-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8040/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 21:21:59 -0000	1.2
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <th>Status</th>
  </tr>
  
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <!-- <th>Status</th> -->
  </tr>
  
***************
*** 92,101 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
--- 96,105 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <!-- <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
***************
*** 103,107 ****
  Not renewable
  <!-- /TMPL_IF -->
! </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 107,111 ----
  Not renewable
  <!-- /TMPL_IF -->
! </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 121,136 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
--- 125,144 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>




From oleonard at users.sourceforge.net  Wed Jan 19 22:39:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:39:28 -0800
Subject: [Koha-cvs] CVS: koha request.pl,1.28,1.29
Message-ID: <E1CrNY0-0003Rv-8l@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13177

Modified Files:
	request.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should display that information.

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** request.pl	13 Jul 2004 12:55:01 -0000	1.28
--- request.pl	19 Jan 2005 21:39:25 -0000	1.29
***************
*** 134,141 ****
--- 134,145 ----
  		my $item = $res->{'itemnumber'};
  		$item = getiteminformation(\%env,$item);
+ 		$reserve{'holdingbranch'}=$item->{'holdingbranch'};
  		$reserve{'barcode'}=$item->{'barcode'};
  		$reserve{'biblionumber'}=$item->{'biblionumber'};
  		$reserve{'wbrcode'} = $res->{'branchcode'};
  		$reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 		if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+ 			$reserve{'atdestination'} = 1;
+ 		}
      }
      $reserve{'date'} = format_date($res->{'reservedate'});




From oleonard at users.sourceforge.net  Wed Jan 19 22:45:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:45:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.17,1.18
Message-ID: <E1CrNeJ-0003ys-10@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15288/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Otherwise waiting items will be shown as "in transit" between holding branch and destination branch.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
--- request.tmpl	19 Jan 2005 21:45:56 -0000	1.18
***************
*** 109,113 ****
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 							Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">
--- 109,118 ----
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 						<!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- /TMPL_IF -->
! 		<input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">




From tipaul at users.sourceforge.net  Thu Jan 20 16:06:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 20 Jan 2005 07:06:35 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_tag_structure.pl,1.2,1.2.2.1
Message-ID: <E1CrdtL-0008Qq-3o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32360/admin

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.pl 
Log Message:
deleting tags for the requested framework only.

Index: auth_tag_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.pl	10 Jun 2004 08:58:34 -0000	1.2
--- auth_tag_structure.pl	20 Jan 2005 15:06:31 -0000	1.2.2.1
***************
*** 174,177 ****
--- 174,178 ----
  	$template->param(liblibrarian => $data->{'liblibrarian'},
  							searchfield => $searchfield,
+ 							authtypecode => $authtypecode,
  							);
  													# END $OP eq DELETE_CONFIRM
***************
*** 180,185 ****
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield'");
  	}
  													# END $OP eq DELETE_CONFIRMED
--- 181,186 ----
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
  	}
  													# END $OP eq DELETE_CONFIRMED




From oleonard at users.sourceforge.net  Thu Jan 20 18:34:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:34:32 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.3.2.1
Message-ID: <E1CrgCW-00025w-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8017/admin

Modified Files:
      Tag: rel_2_2
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:34:30 -0000	1.3.2.1
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:36:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:36:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.3.2.1
Message-ID: <E1CrgED-0002Fa-Vi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8610/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:36:15 -0000	1.3.2.1
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:37:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:37:58 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.4
Message-ID: <E1CrgFq-0002Mg-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9072/admin

Modified Files:
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:37:56 -0000	1.4
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:38:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:38:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.4
Message-ID: <E1CrgGA-0002P6-IV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9222/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:38:16 -0000	1.4
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:39:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:39:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters biblio_framework.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1
Message-ID: <E1CrgHV-0002VQ-Kf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9613/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 18:41:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:41:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1.2.1 auth_tag_structure.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1
Message-ID: <E1CrgIv-0002bx-2r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
      Tag: rel_2_2
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 19:03:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:03:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.35
Message-ID: <E1Crgef-0003zx-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15346/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:03:33 -0000	1.35
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:04:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:04:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.34.2.1
Message-ID: <E1Crgfr-000461-LG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15729/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
      Tag: rel_2_2
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -r1.34 -r1.34.2.1
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:04:49 -0000	1.34.2.1
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:42:37 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32.2.1,1.32.2.2
Message-ID: <E1CrhGP-0006Um-PO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24947/admin

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C2 -r1.32.2.1 -r1.32.2.2
*** marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
--- marc_subfields_structure.pl	20 Jan 2005 18:42:29 -0000	1.32.2.2
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 19:44:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:44:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.38.2.1
Message-ID: <E1CrhHx-0006bv-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25334/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -r1.38 -r1.38.2.1
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:44:05 -0000	1.38.2.1
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:45:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:45:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.39
Message-ID: <E1CrhJF-0006iP-LS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25747/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:45:29 -0000	1.39
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:48:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:48:17 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32,1.33
Message-ID: <E1CrhLt-0006vq-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26578/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	20 Jan 2005 18:48:12 -0000	1.33
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.3.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.2,1.2.2.1 newbasket2.tmpl,1.1,1.1.2.1 order.tmpl,1.2,1.2.2.1 recieve.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 supplier.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri2G-00010b-PC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3765/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	20 Jan 2005 19:31:57 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	20 Jan 2005 19:31:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri2q-00012w-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
      Tag: rel_2_2
	marcimport.tmpl 
Log Message:
Correction to header includes

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	20 Jan 2005 19:32:37 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 20:34:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:34:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Cri49-00017f-GK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4275/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:46:27 -0000	1.1.2.1
--- addbookbybiblionumber.tmpl	20 Jan 2005 19:33:57 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Thu Jan 20 20:35:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:35:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri5t-0001Dp-37@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4677/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	branchtransfers.tmpl 
Log Message:
Converting pop-up links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	20 Jan 2005 19:35:46 -0000	1.2.2.1
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 20:37:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:37:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.2.2.1 newimember.tmpl,1.1,1.1.2.1 newjmember.tmpl,1.1,1.1.2.1 newmember.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri74-0001If-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4947/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	20 Jan 2005 19:36:57 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:19:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:19:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22.2.1,1.22.2.2
Message-ID: <E1Crilq-0004fb-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17861/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
--- categorie.tmpl	20 Jan 2005 20:19:05 -0000	1.22.2.2
***************
*** 261,265 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 261,265 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.23
Message-ID: <E1Crimi-0004kC-LA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18170/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	20 Jan 2005 20:20:01 -0000	1.23
***************
*** 263,267 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 263,267 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:18 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.16.2.1
Message-ID: <E1Crimw-0004le-B9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/admin

Modified Files:
      Tag: rel_2_2
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:15 -0000	1.16.2.1
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:21:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:21:11 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.17
Message-ID: <E1Crinn-0004oi-JN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18443/admin

Modified Files:
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:57 -0000	1.17
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:22:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:22:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.1.2.1
Message-ID: <E1CripH-0004uJ-3z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18847/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categoryitem.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	20 Jan 2005 20:22:40 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:23:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:23:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.2.2.1
Message-ID: <E1Cripq-0004wg-8T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:23:15 -0000	1.2.2.1
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:24:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:24:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.3
Message-ID: <E1Criqh-00050w-7i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:24:08 -0000	1.3
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 22:27:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:27:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrjqM-00010Q-DL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
      Tag: rel_2_2
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** acceptorreject.tmpl	13 Jan 2005 20:56:56 -0000	1.1.2.1
--- acceptorreject.tmpl	20 Jan 2005 21:27:52 -0000	1.1.2.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:30:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:30:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1,1.2
Message-ID: <E1Crjst-00019B-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4357/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	13 Jan 2005 20:48:31 -0000	1.1
--- acceptorreject.tmpl	20 Jan 2005 21:30:20 -0000	1.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:31:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:31:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,NONE,1.1.2.1 suggestion-select.tmpl,NONE,1.1.2.1
Message-ID: <E1Crjte-0001DJ-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4647/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
      Tag: rel_2_2
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	<h1>Order search</h3>
	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
		<tr>
			<th>&nbsp;</th>
			<th>Title</th>
			<th>Author</th>
			<th>Supplier</th>
			<th>Placed on</th>
			<th>Recieved on</th>
			<th>Quantity ordered</th>
			<th>&nbsp;</th>
		</tr>
		<tr>
			
				<th>Filter By:</th>
				<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th><input type="submit" class="submit" value="Set Filter" /></th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr>
				<td>&nbsp;</td>
				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
				<td><!-- TMPL_VAR NAME="author" --></td>
				<td><!-- TMPL_VAR NAME="name" --></td>
				<td><!-- TMPL_VAR name="creationdate" --></td>
				<td><!-- TMPL_VAR name="datereceived" --></td>
				<td><!-- TMPL_VAR name="quantity" --></td>
				<td>&nbsp;</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table></form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	
	<form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="post">
<div class="data">	<table>
	<caption>Filter Suggestion Results</caption>
	<tr><th><label for="title">Title:</label></th><td><input type="text" name="title" id="title" value="<!-- TMPL_VAR NAME="title"-->" /></td></tr>
	<tr><th><label for="author">Author:</label> </th><td><input type="text" id="author" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></td></tr>
	<tr><th><label for="publishercode">Publisher:</label></th><td><input type="text" id="publishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></td></tr>
	</table></div>
<p><input type="submit" class="submit" value="Set Filter" /></p></form>
<div class="table searchresults">
	<table>
		<caption>Suggestions</caption>
		<tr>
			<th>Suggestion</th>
			<th>Suggested by</th>
			<th>Accepted by</th>
			<th>&nbsp;</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
					<p>
						<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
				</td>
				<td>
					<!-- TMPL_IF name="biblionumber" -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->">Order</a>
					<!-- TMPL_ELSE -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->">Order</a>
					<!-- /TMPL_IF -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 20 22:32:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:32:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1,1.2 suggestion-select.tmpl,1.1,1.2
Message-ID: <E1CrjuT-0001GX-3H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4840/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte






From oleonard at users.sourceforge.net  Thu Jan 20 22:44:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:44:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,1.2,1.2.2.1
Message-ID: <E1Crk6s-000260-J6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8035/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	about.tmpl 
Log Message:
Synching with default tempalte

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** about.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- about.tmpl	20 Jan 2005 21:44:56 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 8,12 ****
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table"><div class="items"><table>
    <tr>
        <th>Koha version:</th>
--- 8,12 ----
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table items"><table>
    <tr>
        <th>Koha version:</th>
***************
*** 33,56 ****
   <table>
   <caption>Credits</caption>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li>Pat Eyler, Kaitiaki</li>
! 	<li>Paul Poulain, 2.0 release manager (MARC developper)</li>
! 	<li>Joshua Ferraro &amp; the Nelsonville Public Library (MARC features funders)</li>
! 	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
! 	<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 	<li>Mike Hansen</li>
! 	<li>MJ Ray and Turo Technology LLP, England (quality control, installer &amp; updater)</li>
! 	<li>Nicolas Morin, French Translation</li>
! <li><b>Horowhenua Library Trust</b>
! Rosalie Blake, Head of Libraries
! Jo Ransom</li>
! <li><b>Katipo Communications</b>
! Rachel Hamilton-Williams, General Manager (Webmistress)
! Chris Cormack, 1.2 release manager
! and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 						Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul>
  					</td>
  				</tr>
--- 33,57 ----
   <table>
   <caption>Credits</caption>
+ 	<tr><th>Special thanks to the following funders</th></tr>
+ 			<tr><td><ul><li><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
+ 		<li>The <b>Nelsonville Public Library</b> (MARC support)</li>
+ 		<li><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</li>
+ 		<li><b>ENSMP (Ecole Nationale Sup�rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</li></ul></td></tr>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li><b>Rachel Hamilton-Williams</b>, Kaitiaki</li>
! 		<li><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</li>
! 		<li>Stephen Hedges and the <b>Nelsonville Public Library</b> (MARC features funders)</li>
! 		<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 		<li>Mike Hansen</li>
! 		<li>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer and updater, 2.0 release maintainer)</li>
! 		<li><b>Katipo Communications</b></li>
! 		<ul>
! 			<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
! 			<li>Chris Cormack, 1.2 release manager</li>
! 			<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li>
! 			</ul>
  					</td>
  				</tr>
***************
*** 59,92 ****
  					<td>
  <ul>
! 	<li>Adam Thick</li>
! 	<li>Andrew Hooper</li>
! 	<li>Al Banks</li>
! 	<li>Ambrose Li</li>
! 	<li>Andrew Arensburger</li>
! 	<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 	<li>Brig C. McCoy</li>
! 	<li>Daniel Holth</li>
! 	<li>David Strainchamps</li>
! 	<li>Dorian Meid</li>
! 	<li>Ed Summers</li>
! 	<li>Florian Bischof</li>
! 	<li>Francisco M. Marzoa Alonso</li>
! 	<li>Glen Stewart</li>
! 	<li>Henri-Damien Laurent</li>
! 	<li>J�rome Vizcaino (Esiee School)</li>
! 	<li>Kip DeGraaf</li>
! 	<li>Marco Gaiarin</li>
! 	<li>Md. Aftabuddin</li>
! 	<li>Michaes Herman</li>
! 	<li>Michel Lerenard (Esiee School)</li>
! 	<li>Mike Johnson</li>
! 	<li>Mike Mylonas</li>
! 	<li>Pierre Cauchois (Esiee School)</li>
! 	<li>Pawel Skuza (Polish for 1.2)</li>
! 	<li>Regula Sebastiao</li>
! 	<li>Roger Buck</li>
! 	<li>Ron Wickersham</li>
! 	<li>Sebastiaan Durand</li>
! </ul>					</td>
  				</tr>
  			</table>
--- 60,94 ----
  					<td>
  <ul>
! 					<li>Adam Thick</li>
! 					<li>Andrew Hooper</li>
! 					<li>Al Banks</li>
! 					<li>Ambrose Li (chinese translation and translation tool)</li>
! 					<li>Andrew Arensburger (the small and great C4::Context module)</li>
! 					<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 					<li>Brig C. McCoy</li>
! 					<li>Daniel Holth</li>
! 					<li>David Strainchamps</li>
! 					<li>Dorian Meid (German translation)</li>
! 					<li><b>doXulting</b> (Matthieu Branlat) OPAC basket</li>
! 					<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
! 					<li><b>Esiee School</b> (J�rome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
! 					<li>Florian Bischof</li>
! 					<li>Francisco M. Marzoa Alonso</li>
! 					<li>Glen Stewart</li>
! 					<li>Henri-Damien Laurent</li>
! 					<li>Jo Ransom</li>
! 					<li>Kip DeGraaf</li>
! 					<li>Marco Gaiarin</li>
! 					<li>Md. Aftabuddin</li>
! 					<li>Michaes Herman</li>
! 					<li>Mike Johnson</li>
! 					<li>Mike Mylonas</li>
! 					<li>Nicolas Morin (French Translation in 2.0)</li>
! 					<li>Pawel Skuza (Polish for 1.2)</li>
! 					<li>Regula Sebastiao</li>
! 					<li>Roger Buck</li>
! 					<li>Ron Wickersham</li>
! 					<li>Sebastiaan Durand</li>
! 					<li><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</li></ul>					</td>
  				</tr>
  			</table>




From oleonard at users.sourceforge.net  Thu Jan 20 22:58:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:58:28 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrkJw-0002t8-8g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11078/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** auth_tag_structure.tmpl	20 Jan 2005 17:41:00 -0000	1.1.2.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:58:25 -0000	1.1.2.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 22:59:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:59:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1,1.2
Message-ID: <E1CrkKj-0002vv-VZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11254/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_tag_structure.tmpl	18 Jan 2005 22:53:04 -0000	1.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:59:15 -0000	1.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 23:40:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:40:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.2
Message-ID: <E1Crkyp-0005c3-Kw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21546/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:40:40 -0000	1.2
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:41:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.1.2.1
Message-ID: <E1CrkzH-0005eo-6g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:41:08 -0000	1.1.2.1
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:48:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:48:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,NONE,1.1.2.1
Message-ID: <E1Crl6O-000687-Ur@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23551/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
      Tag: rel_2_2
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<div class="tabitem"><form action="MARCdetail.pl" method="get">
<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
</div>

	<div class="isbd">
		<p><!-- TMPL_VAR NAME="ISBD" --></p>
	</div>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 23:51:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:51:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,1.1,1.2
Message-ID: <E1Crl9J-0006PF-7p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block





From acli at users.sourceforge.net  Sun Jan 23 05:31:24 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:31:24 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.html,1.2,1.2.2.1 translator_doc.txt,1.6,1.6.2.1
Message-ID: <E1CsZPI-0007EL-Fu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27739

Modified Files:
      Tag: rel_2_2
	translator_doc.html translator_doc.txt 
Log Message:
Minor updates


Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** translator_doc.html	30 Dec 2004 06:58:19 -0000	1.2
--- translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
***************
*** 4,8 ****
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts:
  
  <ul>
--- 4,9 ----
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts
! (with a number of associated perl module files):
  
  <ul>
***************
*** 28,32 ****
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
--- 29,33 ----
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
***************
*** 41,45 ****
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>
--- 42,46 ----
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>
***************
*** 55,65 ****
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your new css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed
--- 56,66 ----
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your newly updated css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
--- translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
***************
*** 3,7 ****
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts:
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
--- 3,7 ----
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts (with a number of associated perl module files):
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
***************
*** 22,26 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,27 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 33,37 ****
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 34,40 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 44,48 ****
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 47,52 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 50,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
-  
- REBUILD ALL
- ===========
- The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
- Useful for developpers, probably useless for all end-users.
- 
  
  WEAKNESSES
--- 54,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
***************
*** 71,73 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file
--- 71,74 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 




From acli at users.sourceforge.net  Sun Jan 23 05:58:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:58:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1.2.1,1.1.2.2
Message-ID: <E1CsZph-0000MQ-LC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1353

Modified Files:
      Tag: rel_2_2
	Makefile 
Log Message:
Forgot to take out this debugging code


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
--- Makefile	23 Jan 2005 04:58:39 -0000	1.1.2.2
***************
*** 2,6 ****
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:
--- 2,6 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:




From acli at users.sourceforge.net  Sun Jan 23 05:57:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:57:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1,1.1.2.1 translator_doc.html,1.2.2.1,1.2.2.2 translator_doc.txt,1.6.2.1,1.6.2.2
Message-ID: <E1CsZow-0000JI-UF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv985

Modified Files:
      Tag: rel_2_2
	Makefile translator_doc.html translator_doc.txt 
Log Message:
Minor corrections & clarifications, and make the command line examples
not break in the middle (like in the original version)


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** Makefile	30 Dec 2004 06:48:19 -0000	1.1
--- Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
***************
*** 2,4 ****
  
  %.txt: %.html
! 	LANG=C w3m $< > $@
--- 2,7 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
! 
! clean:
! 	rm translator_doc.txt

Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
--- translator_doc.html	23 Jan 2005 04:57:51 -0000	1.2.2.2
***************
*** 7,18 ****
  (with a number of associated perl module files):
  
! <ul>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ul>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories)
!     <li>update an existing translation file.
!     <li>rebuild translated templates from english & translation file.
      </ul>
  </ul>
--- 7,18 ----
  (with a number of associated perl module files):
  
! <ol>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script; and
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ol type=a>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories),
!     <li>update an existing translation file, and
!     <li>rebuild translated templates from English & translation file.
      </ul>
  </ul>
***************
*** 35,41 ****
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended
!     but is not necessary;
!     it makes the resulting PO files somewhat easier to read.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
--- 35,43 ----
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended;
!     it makes the resulting PO files slightly shorter
!     and more usable in a team environment.
!     Absolute paths are certainly fine,
!     and might be better if there is only one translator for your language.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
***************
*** 52,56 ****
  
  <p>
! If something changes in English version:
  <ol>
  <li>Update your translation file:
--- 54,58 ----
  
  <p>
! If something changes in the English version:
  <ol>
  <li>Update your translation file:

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
--- translator_doc.txt	23 Jan 2005 04:57:51 -0000	1.6.2.2
***************
*** 5,15 ****
  2 scripts (with a number of associated perl module files):
  
!   * xgettext.pl, that extracts the texts in a template, and which is called by
!     the script
!   * tmpl_process3.tmpl, which can do 3 things:
!       + create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories)
!       + update an existing translation file.
!       + rebuild translated templates from english & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
--- 5,15 ----
  2 scripts (with a number of associated perl module files):
  
!  1. xgettext.pl, that extracts the texts in a template, and which is called by
!     the script; and
!  2. tmpl_process3.tmpl, which can do 3 things:
!      a. create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories),
!      b. update an existing translation file, and
!      c. rebuild translated templates from English & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
***************
*** 21,41 ****
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
!    
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
!    
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended but is not necessary; it makes the
!     resulting PO files somewhat easier to read.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
!    
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
--- 21,40 ----
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
! 
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended; it makes the resulting PO files slightly
!     shorter and more usable in a team environment. Absolute paths are certainly
!     fine, and might be better if there is only one translator for your
!     language.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
***************
*** 43,61 ****
      tmpl_process3.pl install).
  
! If something changes in English version:
  
   1. Update your translation file:
!    
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
!    
!  2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
!     "fuzzy" and strings that are not translated.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
!    
   4. Copy new images/css files in your new directory if needed
  
--- 42,57 ----
      tmpl_process3.pl install).
  
! If something changes in the English version:
  
   1. Update your translation file:
! 
!         ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
!  2. Translate your newly updated css_opac_fr_FR.po file. Look for strings
!     marked as "fuzzy" and strings that are not translated.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
   4. Copy new images/css files in your new directory if needed
  




From acli at users.sourceforge.net  Sun Jan 23 06:16:18 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 21:16:18 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.3,1.1.2.4
Message-ID: <E1Csa6k-0001Gt-8L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4100

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Added a --pot option to generate the POT (PO template) file.

The POT files are currently named like css_opac_en_EN.po, which
are not what they would usually be named.


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
--- update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
***************
*** 6,12 ****
  use strict;
  use integer;
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
  # Remember whether we see the "po" directory; this is used later to guess
--- 6,22 ----
  use strict;
  use integer;
+ use Getopt::Long;
+ 
+ use vars qw( $pot_p );
+ 
+ GetOptions(
+    '--pot' => \$pot_p,
+ ) || exit(1);
  
  my $lang = $ARGV[0];
! die <<EOF unless $pot_p || $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
! Usage: $0 LANG
!        $0 --pot
! EOF
  
  # Remember whether we see the "po" directory; this is used later to guess
***************
*** 32,38 ****
  
        # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
  
        die "tmpl_process3.pl: exec: $!\n";
--- 42,54 ----
  
        # Now call tmpl_process3.pl to do the real work
!       #
!       # Traditionally, the pot file should be named PACKAGE.pot
!       # (for Koha probably something like koha_intranet_css.pot),
!       # but this is not Koha's convention.
!       #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
!       exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', $target, '-r');
  
        die "tmpl_process3.pl: exec: $!\n";




From acli at users.sourceforge.net  Sun Jan 23 07:15:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:15:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6,1.6.2.1
Message-ID: <E1Csb1z-0004dd-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17798

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po 
Log Message:
Minor syntactical corrections


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
--- css_opac_fr_FR.po	23 Jan 2005 06:15:24 -0000	1.6.2.1
***************
*** 1,17 ****
! # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
! "Language-Team: Cymraeg <cy at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8-bit\n"
- "X-Generator: Kartouche 0.2 - 28 October 2003\n"
  "\n"
  
--- 1,17 ----
! # Koha OPAC module, French translation
! # Copyright (C) 2000-2005 Katipo Communications
! # This file is distributed under the same license as the Koha package.
! # Copyright 2004-2005 French translation team
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: koha-opac 2.2\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: Paul POULAIN <tipaul at users.sourceforge.net>\n"
! "Language-Team: French <fr at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8-bit\n"
  "\n"
  
***************
*** 284,289 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
--- 284,288 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s"
  
  #. For the first occurrence, 
***************
*** 1966,1970 ****
  #~ msgid "ISBD : %s" 
  #~ msgstr "ISBD : %s"
- msgid ""
- msgstr ""
- 
--- 1965,1966 ----




From acli at users.sourceforge.net  Sun Jan 23 07:17:07 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:07 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,NONE,1.1.2.1
Message-ID: <E1Csb3b-0004iD-ID@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18025

Added Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Translation progress statistics script borrowed from gaim


--- NEW FILE ---
#!/usr/bin/perl

# Copyright 2003-2004 Nathan Walp <faceprint at faceprint.com>
# Adapted for Koha by Ambrose Li <acli at ada.dhs.org>
#
# This program 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.
#
# This program 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 this program; if not, write to the Free Software
# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307  USA
#


my $PACKAGE="koha";


use Locale::Language;

$lang{en_AU} = "English (Australian)";
$lang{en_CA} = "English (Canadian)";
$lang{en_GB} = "English (British)";
$lang{es_AR} = "Spanish (Argentinian)";
$lang{fr_FR} = "French"; # FIXME: should be just "fr"
$lang{my_MM} = "Burmese (Myanmar)";
$lang{pl_PL} = "Polish"; # FIXME: should be just "pl"
$lang{pt_BR} = "Portuguese (Brazilian)";
$lang{'sr at Latn'} = "Serbian (Latin)";
$lang{zh_CN} = "Chinese (Simplified)";
$lang{zh_TW} = "Chinese (Traditional)";

$ENV{LANG} = $ENV{LC_ALL} = 'C';

opendir(DIR, ".") || die "can't open directory: $!";
@pos = grep { /\.po$/ && -f } readdir(DIR);
foreach (@pos) { s/\.po$//; };
closedir DIR;

@pos = sort @pos;

$now = `date`;

#system("./update.pl --pot > /dev/null");

print "<html>\n";
print "<head><title>$PACKAGE i18n statistics</title></head>\n";
print "<body>\n";

opendir(DIR, ".") || die "can't open directory: $!";
@templates = grep { /\.pot$/ && -f } readdir(DIR);
foreach (@templates) { s/\.pot$//; };
closedir DIR;
for my $PACKAGE (sort {
	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
	    $module1 cmp $module2 && $theme1 cmp $theme2
	} @templates) {
    my @pos_orig = @pos;
    my @pos = grep { /^${PACKAGE}_/ } @pos_orig;
    my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;

$_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;

die "unable to get total: $!" unless (/(\d+) untranslated messages/);

$total = $1;

print "<h1>Module $module, theme $theme</h1>\n";
print "<table cellspacing='0' cellpadding='0' border='0' bgcolor='#888888' width='100%'><tr><td><table cellspacing='1' cellpadding='2' border='0' width='100%'>\n";

print"<tr bgcolor='#e0e0e0'><th>language</th><th style='background: #339933;'>trans</th><th style='background: #339933;'>%</th><th style='background: #333399;'>fuzzy</th><th style='background: #333399;'>%</th><th style='background: #dd3333;'>untrans</th><th style='background: #dd3333;'>%</th><th>&nbsp;</th></tr>\n";

foreach $index (0 .. $#pos) {
	$trans = $fuzz = $untrans = 0;
	$po = $pos[$index];
	next if $po =~ /_en_EN/; # Koha-specific
	print STDERR "$po..." if($ARGV[0] eq '-v');
	system("msgmerge $po.po $PACKAGE.pot -o $po.new 2>/dev/null");
	$_ = `msgfmt --statistics $po.new -o /dev/null 2>&1`;
	chomp;
	if(/(\d+) translated message/) { $trans = $1; }
	if(/(\d+) fuzzy translation/) { $fuzz = $1; }
	if(/(\d+) untranslated message/) { $untrans = $1; }
	$transp = 100 * $trans / $total;
	$fuzzp = 100 * $fuzz / $total;
	$untransp = 100 * $untrans / $total;
	if($index % 2) {
		$color = " bgcolor='#e0e0e0'";
	} else {
		$color = " bgcolor='#d0e0ff'";
	}
	my $lang = $1 if $po =~ /^${PACKAGE}_(.*)$/; # Koha-specific
	$name = "";
	$name = $lang{$lang}; # NOTE
	$name = code2language($lang) unless $name ne ""; # NOTE
	$name = "???" unless $name ne "";
	printf "<tr$color><td>%s(%s.po)</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>",
	$name, $po, $trans, $transp, $fuzz, $fuzzp, $untrans, $untransp;
	printf "<img src='bar_g.gif' height='15' width='%0.0f' />", $transp*2
	unless $transp*2 < 0.5;
	printf "<img src='bar_b.gif' height='15' width='%0.0f' />", $fuzzp*2
	unless $fuzzp*2 < 0.5;
	printf "<img src='bar_r.gif' height='15' width='%0.0f' />", $untransp*2
	unless $untransp*2 < 0.5;
	print "</tr>\n";
	unlink("$po.new");
	print STDERR "done ($untrans untranslated strings).\n" if($ARGV[0] eq '-v');
}
print "</table></td></tr></table>\n";
print "Latest $PACKAGE.pot generated $now: <a href='$PACKAGE.pot'>$PACKAGE.pot</a><br />\n";
}
print "</body>\n";
print "</html>\n";





From acli at users.sourceforge.net  Sun Jan 23 07:17:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.1,1.1.2.2
Message-ID: <E1Csb4M-0004jp-MF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to re-enable update.pl


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** stats.pl	23 Jan 2005 06:17:05 -0000	1.1.2.1
--- stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
***************
*** 48,52 ****
  $now = `date`;
  
! #system("./update.pl --pot > /dev/null");
  
  print "<html>\n";
--- 48,52 ----
  $now = `date`;
  
! system("./update.pl --pot > /dev/null");
  
  print "<html>\n";




From acli at users.sourceforge.net  Sun Jan 23 07:22:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:22:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Csb8n-0004vm-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18923

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
create fails if the pot file already exists


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
--- update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
***************
*** 48,51 ****
--- 48,52 ----
        #
        my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
+       rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",




From acli at users.sourceforge.net  Sun Jan 23 07:49:11 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:49:11 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator xgettext.pl,1.13,1.13.2.1
Message-ID: <E1CsbYd-0006NV-7x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24427

Modified Files:
      Tag: rel_2_2
	xgettext.pl 
Log Message:
I think I know where the spurious leading spaces are from now
But there is no fix yet


Index: xgettext.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** xgettext.pl	30 Dec 2004 06:48:20 -0000	1.13
--- xgettext.pl	23 Jan 2005 06:49:08 -0000	1.13.2.1
***************
*** 462,468 ****
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! It sometimes generates strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.  The cause of this is not yet known.
  
  =cut
--- 462,469 ----
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! If a Javascript string has leading spaces, it will
! generate strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.
  
  =cut




From acli at users.sourceforge.net  Sun Jan 23 08:05:51 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 23:05:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35,1.35.2.1
Message-ID: <E1Csbol-0007Ab-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27541

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
This should fix bug 913


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** TmplTokenizer.pm	30 Dec 2004 06:53:13 -0000	1.35
--- TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,353 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;
--- 349,354 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Sun Jan 23 09:16:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:16:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.5,1.1.2.6
Message-ID: <E1Cscvb-000249-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7900

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Forgot a _ in the po file filename


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
--- update.pl	23 Jan 2005 08:16:57 -0000	1.1.2.6
***************
*** 47,51 ****
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
--- 47,51 ----
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "_$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),




From acli at users.sourceforge.net  Sun Jan 23 09:17:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:17:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4,1.4.2.1 default_intranet_zh_TW.po,1.4,1.4.2.1
Message-ID: <E1Cscw5-00026C-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7991

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Partial updates


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** css_opac_zh_TW.po	30 Dec 2004 09:37:19 -0000	1.4
--- css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2004-12-30 02:06-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
[...2271 lines suppressed...]
+ #~ msgstr "%s (%s本書)"
+ 
  #~ msgid "%s <b>acquired in the last %S days</b>"
  #~ msgstr "<b>最近%2$S日內新到的</b>%1$s"
  
+ #~ msgid "%s(%s books)"
+ #~ msgstr "%s(%s本書)"
+ 
  #~ msgid "<b>ISBN:</b><a1>%s</a>"
  #~ msgstr "<b>國際標準書號：</b><a1>%s</a>"
***************
*** 2089,2095 ****
  #~ msgstr "青年小說類"
  
- #~ msgid "text/html; charset=iso-8859-1"
- #~ msgstr "text/html; charset=UTF-8"
- 
  #~ msgid "to Koha"
  #~ msgstr "Koha"
--- 2209,2212 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** default_intranet_zh_TW.po	30 Dec 2004 10:29:28 -0000	1.4
--- default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2004-12-30 04:23-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...5497 lines suppressed...]
***************
*** 21830,21833 ****
--- 21960,21966 ----
  #~ msgstr "電話：%s，傳真：%s"
  
+ #~ msgid "Pierre Cauchois (Esiee School)"
+ #~ msgstr "Pierre Cauchois (ESIEE學院)"
+ 
  #~ msgid "Previous"
  #~ msgstr "上一頁"
***************
*** 21843,21849 ****
  #~ msgstr "還書日期"
  
- #~ msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
- #~ msgstr "Rachel Hamilton-Williams (總經理兼網站管理人)"
- 
  #  NOTE 譯文更動 by Arthur
  #  NOTE 譯文更動 by Ambrose
--- 21976,21979 ----




From acli at users.sourceforge.net  Sun Jan 23 09:59:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:59:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.2,1.1.2.3
Message-ID: <E1Csdav-00042t-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15497

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to remove some other debugging code
Fixed the sorting order


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
--- stats.pl	23 Jan 2005 08:59:39 -0000	1.1.2.3
***************
*** 61,65 ****
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    $module1 cmp $module2 && $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
--- 61,65 ----
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    return $module1 cmp $module2 || $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
***************
*** 67,71 ****
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);
--- 67,71 ----
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);




From acli at users.sourceforge.net  Sun Jan 23 11:51:21 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 02:51:21 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.20,1.20.2.1
Message-ID: <E1CsfKz-0001ng-IF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6839

Modified Files:
      Tag: rel_2_2
	tmpl_process3.pl 
Log Message:
Make the generated pot file (i.e., result of "create") look more "real",
but using msgmerge to reformat the output


Index: tmpl_process3.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -r1.20 -r1.20.2.1
*** tmpl_process3.pl	10 Mar 2004 07:00:28 -0000	1.20
--- tmpl_process3.pl	23 Jan 2005 10:51:16 -0000	1.20.2.1
***************
*** 263,276 ****
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph, $tmpfile) = tmpnam();
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph "$input\n";
      }
!     close $tmph;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file);
!     warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0;
! #   unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {
--- 263,301 ----
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph1, $tmpfile1) = tmpnam();
!     my($tmph2, $tmpfile2) = tmpnam();
!     close $tmph2; # We just want a name
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph1 "$input\n";
      }
!     close $tmph1;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2);
!     # Run msgmerge so that the pot file looks like a real pot file
!     # We need to help msgmerge a bit by pre-creating a dummy po file that has
!     # the headers and the "" msgid & msgstr. It will fill in the rest.
!     if ($st == 0) {
! 	# Merge the temporary "pot file" with the specified po file ($str_file)
! 	# FIXME: msgmerge(1) is a Unix dependency
! 	# FIXME: need to check the return value
! 	unless (-f $str_file) {
! 	    local(*INPUT, *OUTPUT);
! 	    open(INPUT, "<$tmpfile2");
! 	    open(OUTPUT, ">$str_file");
! 	    while (<INPUT>) {
! 		print OUTPUT;
! 	    last if /^\n/s;
! 	    }
! 	    close INPUT;
! 	    close OUTPUT;
! 	}
! 	$st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2);
!     } else {
! 	error_normal "Text extraction failed: $xgettext: $!\n", undef;
! 	error_additional "Will not run msgmerge\n", undef;
!     }
! #   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
! #   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {




From acli at users.sourceforge.net  Mon Jan 24 03:47:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 18:47:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1CsuGb-0007dh-3v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29279

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Partial update. This should be reasonably "finished".


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
***************
*** 223,227 ****
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "【<a1>%s之個人主頁</a>】【<a2>登出</a>】"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
--- 223,227 ----
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "<a1>%s 之個人主頁</a>　<a2>登出</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1> 簡要 </a> <a2> 詳盡 </a> <a3> ISBD </a> <a4> 新增至虛擬書架 </a> "
! "<a5> 列印 </a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　"
! "<a5>列印</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 614,624 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
--- 614,625 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr "任何人都有權管理公家書架。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr "任何人都可以看見公開的私人書架，但只有您有權管理"
  
+ #  FIXME grammatical mistake in original ("every words")
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
***************
*** 628,631 ****
--- 629,633 ----
  "will be discarded."
  msgstr ""
+ "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 649,656 ****
  msgstr "採購日期"
  
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr ""
  
  #. INPUT type=submit
--- 651,659 ----
  msgstr "採購日期"
  
+ #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr "把點選的項目放至書籃"
  
  #. INPUT type=submit
***************
*** 679,683 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
--- 682,686 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr "新增至書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
***************
*** 716,722 ****
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
- #, fuzzy
  msgid "Any word"
! msgstr "關鍵詞"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
--- 719,724 ----
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
  msgid "Any word"
! msgstr "任何字詞"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
***************
*** 783,803 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "Biblio(s) added"
! msgstr "沒有新增書目記錄"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
--- 785,805 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr "書籃是空的"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr "書目已放在書籃內"
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr "書籃"
  
+ # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio(s) added"
! msgstr "成功新增書目"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
***************
*** 881,887 ****
  msgstr "館藏：%s"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
--- 883,890 ----
  msgstr "館藏：%s"
  
+ #  NOTE 虛擬書架內含多少本書 (shelfbookcount)
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr "書目數量"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
***************
*** 931,940 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr ""
  
  # NOTE 譯文更動 by Arthur
--- 934,943 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr "要清空書籃嗎？"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr "要移除點選的書目嗎？"
  
  # NOTE 譯文更動 by Arthur
***************
*** 968,974 ****
  "將會收到電郵通知。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 971,978 ----
  "將會收到電郵通知。"
  
+ #  NOTE
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "過濾條件："
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
--- 990,994 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr "公家書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
***************
*** 996,1000 ****
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
--- 1000,1004 ----
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr "您好！這是 %s 送來的書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
***************
*** 1034,1037 ****
--- 1038,1042 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
+ "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two tower*」會找到「the two towers」、「two white towers」及「a tower and two cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1195,1199 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
--- 1200,1204 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr "未有點選書目"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
***************
*** 1244,1248 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr ""
  
  # NOTE 譯文更動 by Arthur
--- 1249,1253 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr "線上目錄書籃"
  
  # NOTE 譯文更動 by Arthur
***************
*** 1273,1285 ****
  msgstr "其他選項"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
- #, fuzzy
  msgid "Partial search"
! msgstr "館藏查詢"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
--- 1278,1290 ----
  msgstr "其他選項"
  
+ #  NOTE 暫譯
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr "架主"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
  msgid "Partial search"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
***************
*** 1329,1337 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
--- 1334,1342 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr "私家書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr "送出書籃途中出現問題……"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
--- 1346,1350 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr "公開的私人書架"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
***************
*** 1514,1519 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
--- 1519,1525 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr "送出書籃中"
  
+ #  FIXME 這個，看了原始碼也不明白是什麼
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
***************
*** 1521,1525 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=serial
--- 1527,1531 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr "期刊期數"
  
  #. %1$s: TMPL_VAR name=serial
***************
*** 1536,1540 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
--- 1542,1546 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr "設定過濾條件"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
***************
*** 1651,1655 ****
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=reservecount
--- 1657,1661 ----
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr "書籃已送給：%s"
  
  #. %1$s: TMPL_VAR name=reservecount
***************
*** 1671,1675 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
--- 1677,1681 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr "這個書目已在書籃內"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
***************
*** 1867,1871 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1873,1877 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr "您的書籃"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1876,1890 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr ""
  
- # NOTE This refers to new books acquired in the last so-and-so days
- # NOTE This is essentially the same string as the next, but different
- # NOTE due to technical difficulties (in creating an msgid from the HTML)
- # FIXME This string as it is is nearly untranslatable. The scanner need to be fixed.
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
--- 1882,1891 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "私家書籃由您自己管理，也只有您才看見。"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "already in the basket"
! msgstr "已在書籃內"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
***************
*** 1925,1931 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
- #, fuzzy
  msgid "in"
! msgstr "讀者登記"
  
  #. IMG
--- 1926,1931 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
  msgid "in"
! msgstr "在"
  
  #. IMG
***************
*** 2055,2061 ****
  #~ msgstr "<b>國際標準書號：</b><a1>%s</a>"
  
- #~ msgid "<em><a1>%s (%s)</a></em>"
- #~ msgstr "<em><a1>%s (%s)</a></em>"
- 
  #~ msgid "AMOUNT"
  #~ msgstr "金額"
--- 2055,2058 ----
***************
*** 2064,2073 ****
  #~ msgstr "紀錄正確嗎？"
  
- #~ msgid "Apr"
- #~ msgstr "四月"
- 
- #~ msgid "Aug"
- #~ msgstr "八月"
- 
  #~ msgid "Compact Disc"
  #~ msgstr "光碟"
--- 2061,2064 ----
***************
*** 2077,2086 ****
  #~ msgstr "目前狀態"
  
- #~ msgid "Day"
- #~ msgstr "日"
- 
- #~ msgid "Dec"
- #~ msgstr "十二月"
- 
  #~ msgid "Easy / Picture Books"
  #~ msgstr "淺易/圖畫書"
--- 2068,2071 ----
***************
*** 2100,2118 ****
  #~ msgstr "罰款及費用"
  
- #~ msgid "Feb"
- #~ msgstr "二月"
- 
  #~ msgid "Illustrator"
  #~ msgstr "繪圖"
  
- #~ msgid "Jan"
- #~ msgstr "一月"
- 
- #~ msgid "Jul"
- #~ msgstr "七月"
- 
- #~ msgid "Jun"
- #~ msgstr "六月"
- 
  # NOTE 譯文更動 by Arthur
  #~ msgid "Junior Fiction"
--- 2085,2091 ----
***************
*** 2123,2138 ****
  #~ msgstr "學童/初級非小說"
  
- #~ msgid "KOHA"
- #~ msgstr "KOHA"
- 
  #~ msgid "KOHA: OPAC Catalogue Search"
  #~ msgstr "KOHA：查詢館藏"
  
- #~ msgid "Log In to Koha"
- #~ msgstr "登入Koha"
- 
- #~ msgid "Mar"
- #~ msgstr "三月"
- 
  #~ msgid "Next Page"
  #~ msgstr "下一頁"
--- 2096,2102 ----
***************
*** 2155,2161 ****
  #~ "鍵字。"
  
- #~ msgid "Nov"
- #~ msgstr "十一月"
- 
  #~ msgid "OR :"
  #~ msgstr "或："
--- 2119,2122 ----
***************
*** 2164,2170 ****
  #~ msgstr "或下列最少一項："
  
- #~ msgid "Oct"
- #~ msgstr "十月"
- 
  #~ msgid "Previous Page"
  #~ msgstr "上一頁"
--- 2125,2128 ----
***************
*** 2186,2192 ****
  #~ msgstr "稱號"
  
- #~ msgid "Sep"
- #~ msgstr "九月"
- 
  # NOTE 譯文更動 by Arthur
  #~ msgid "Something new ?"
--- 2144,2147 ----
***************
*** 2208,2212 ****
  #~ msgid "Young Adult Fiction"
  #~ msgstr "青年小說類"
- 
- #~ msgid "to Koha"
- #~ msgstr "Koha"
--- 2163,2164 ----




From acli at users.sourceforge.net  Mon Jan 24 05:43:23 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:43:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1,1.1.2.1
Message-ID: <E1Csw4R-0006ip-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling corrections


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_126a.tmpl	7 Jun 2004 10:04:00 -0000	1.1
--- unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
***************
*** 498,502 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 498,502 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 584,588 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 584,588 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 670,674 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 670,674 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 756,760 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 756,760 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 842,846 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 842,846 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 928,932 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 928,932 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>





From acli at users.sourceforge.net  Mon Jan 24 05:45:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:45:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1Csw6R-0006rD-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26187

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial updates, mostly Unimarc stuff
(CMARC seems to be mostly identical to French Unimarc)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
***************
*** 141,145 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr ""
  
  #. For the first occurrence,
--- 141,145 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」……)"
  
[...961 lines suppressed...]
--- 3685,3690 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:369
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:371
  msgid "Autre"
! msgstr "其他"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:218
***************
*** 3863,3867 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500
--- 3868,3872 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr "其他史料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500




From acli at users.sourceforge.net  Mon Jan 24 06:43:12 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:43:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Csx0K-00028G-Da@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8182

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
--- unimarc_field_126a.tmpl	24 Jan 2005 05:43:10 -0000	1.1.2.2
***************
*** 490,494 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

--- 490,494 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

***************
*** 576,580 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

--- 576,580 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

***************
*** 662,666 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

--- 662,666 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

***************
*** 748,752 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

--- 748,752 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

***************
*** 834,838 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

--- 834,838 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

***************
*** 920,924 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->

--- 920,924 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->





From acli at users.sourceforge.net  Mon Jan 24 06:53:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:53:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.2,1.4.2.3 default_intranet_zh_TW.po,1.4.2.2,1.4.2.3
Message-ID: <E1CsxA2-0002fc-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
126a mostly done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
--- css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　"
! "<a5>列印</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>簡要</a>　<a2>詳盡</a>　<a3>ISBD</a>　<a4>新增至虛擬書架</a>　<a5>列印</"
! "a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 629,633 ****
  "will be discarded."
  msgstr ""
! "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
--- 629,635 ----
  "will be discarded."
  msgstr ""
! "查詢時會用您所輸入的所有字詞作出搜尋，但某些不重要的字會被忽略。例如，如果您"
! "在題名欄輸入「the two towers」，查詢結果將會包括所有題名有「two」及「tower」"
! "二字的圖書資料，而「the」字則會被忽略。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 1038,1042 ****
  "towers\", \"a tower and two cities\""
  msgstr ""
! "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two tower*」會找到「the two towers」、「two white towers」及「a tower and two cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1040,1046 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
! "假如您只想輸入字詞的部分，在字詞後鍵入「*」號或「%」號即可。例如，「two "
! "tower*」會找到「the two towers」、「two white towers」及「a tower and two "
! "cities」"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1411,1416 ****
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "請注意，圖書資料的題名可能是關於一個著者（例如 Victor Hugo）、一間公司、一個機構、"
! "或者一個組織（例如 CNRS、美國國會圖書館）等"
  
  #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
--- 1415,1420 ----
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "請注意，圖書資料的題名可能是關於一個著者（例如 Victor Hugo）、一間公司、一個"
! "機構、或者一個組織（例如 CNRS、美國國會圖書館）等"
  
  #  NOTE「Items」這裡可以算是「圖書資料」，也可以算（畫面顯示的）「項目」
***************
*** 1501,1505 ****
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "假如您只想查詢某一間分館的館藏，請先選擇分館；否則查詢結果會包括所有分館的館藏。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
--- 1505,1510 ----
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "假如您只想查詢某一間分館的館藏，請先選擇分館；否則查詢結果會包括所有分館的館"
! "藏。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
***************
*** 1815,1819 ****
  "illustrator...)"
  msgstr ""
! "您可以輸入著者的姓或名。附加著者及其他有關的欄位（譯者、繪圖等等）也會列入搜尋範圍之內。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
--- 1820,1825 ----
  "illustrator...)"
  msgstr ""
! "您可以輸入著者的姓或名。附加著者及其他有關的欄位（譯者、繪圖等等）也會列入搜"
! "尋範圍之內。"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
--- default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...1012 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
--- 18929,18933 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:171
  msgid "Type de son:"
! msgstr "聲道類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
***************
*** 19568,19572 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "速度："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338
--- 19547,19551 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "錄音速度："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338




From acli at users.sourceforge.net  Mon Jan 24 07:32:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:32:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.3,1.4.2.4
Message-ID: <E1Csxly-0004vE-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18639

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
126b done (i.e., translations that can be copied from CMARC have been copied)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
***************
*** 1077,1081 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
--- 1077,1081 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr "3 7/8 × 2 1/2 吋（卡式錄音帶）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
***************
*** 1156,1164 ****
  msgstr "2 個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
- #, fuzzy
  msgid "2 pouces"
! msgstr "-> 資源"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
--- 1156,1164 ----
  msgstr "2 個月"
  
+ #  TODO CMARC 寫 f6e 為「1 吋」，但「1 吋」為 f6c，CMARC 文件有錯
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
  msgid "2 pouces"
! msgstr "2 吋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
***************
*** 3993,3997 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
--- 3993,3997 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr "母帶 (master tape)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
***************
*** 4075,4083 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
--- 4075,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr "複製母帶 (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr "複製母帶 (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
***************
*** 5685,5689 ****
  #, fuzzy
  msgid "Codage CX"
! msgstr "編碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
--- 5685,5689 ----
  #, fuzzy
  msgid "Codage CX"
! msgstr "CX 編碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
***************
*** 6372,6376 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
--- 6372,6376 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr "圓形錄音筒"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
***************
*** 7016,7020 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
--- 7016,7020 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr "唱片母模板 (disc master, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
***************
*** 7133,7137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
--- 7133,7137 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr "紙背 (paper backed)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
***************
*** 8632,8646 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
--- 8632,8646 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr "現場錄音者（定點錄音）(instantaneous)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr "側面切割式"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
***************
*** 8683,8693 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
- #, fuzzy
  msgid "Grec"
! msgstr "法文"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
--- 8683,8692 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr "高低式起伏"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
  msgid "Grec"
! msgstr "希臘文"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
***************
*** 8696,8700 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
--- 8695,8699 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr "格林尼治（英國）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
***************
*** 8718,8721 ****
--- 8717,8721 ----
  "Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
  msgstr ""
+ "Gynn Lomax、Richard Anderson、Jeremy Blake、Rebecca Holden、Olive T. Canine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:66
***************
*** 8724,8730 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
- #, fuzzy
  msgid "HELP Ordering"
! msgstr "採購說明："
  
  #  NOTE 譯文更動 by Arthur
--- 8724,8729 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
  msgid "HELP Ordering"
! msgstr "訂購說明"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 8744,8753 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
- #, fuzzy
  msgid "HINT for issues"
! msgstr "借出次數"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
--- 8743,8751 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr "罰款提示"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
  msgid "HINT for issues"
! msgstr "借出說明"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
***************
*** 10632,10638 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
- #, fuzzy
  msgid "Laque"
! msgstr "語言"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
--- 10630,10635 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
  msgid "Laque"
! msgstr "lacquered（如，醋酸鹽等）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
***************
*** 11496,11500 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
--- 11493,11497 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr "壓模版 (stamper, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
***************
*** 11504,11510 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
- #, fuzzy
  msgid "May"
! msgstr "繳交"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
--- 11501,11506 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
  msgid "May"
! msgstr "五月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
***************
*** 11720,11726 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
- #, fuzzy
  msgid "Metal"
! msgstr "男"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
--- 11716,11721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
  msgid "Metal"
! msgstr "金屬（如，鋁等）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
***************
*** 11736,11740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
--- 11731,11735 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr "金屬及塑膠（雷射唱片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
***************
*** 13197,13203 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
- #, fuzzy
  msgid "Nord"
! msgstr "字詞"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
--- 13192,13197 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
  msgid "Nord"
! msgstr "北"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
***************
*** 13220,13233 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
--- 13214,13229 ----
  msgstr ""
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr "CCIR/IEC 標準"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr "ISO "
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
***************
*** 13463,13466 ****
--- 13459,13463 ----
  msgstr ""
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:981
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:983
***************
*** 13468,13475 ****
  msgstr "數碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
--- 13465,13473 ----
  msgstr "數碼"
  
+ #  NOTE 暫譯，CMARC 無此分欄
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr "數碼（雷射唱片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
***************
*** 14089,14093 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
--- 14087,14091 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr "塑膠 (PVC)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
***************
*** 14105,14116 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
- #, fuzzy
  msgid "Page Size"
! msgstr "大小"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
- #, fuzzy
  msgid "Page Type"
! msgstr "圖書資料類別"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
--- 14103,14112 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
  msgid "Page Size"
! msgstr "頁面大小"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
  msgid "Page Type"
! msgstr "紙張類型"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
***************
*** 14778,14781 ****
--- 14774,14778 ----
  msgstr ""
  
+ #  NOTE CMARC 126b 無 2h
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:365
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:367
***************
*** 14787,14791 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
--- 14784,14788 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr "塑膠"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
***************
*** 14961,14965 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
--- 14958,14962 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr "多元脂 (polyester)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
***************
*** 15132,15139 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15129,15137 ----
  msgstr ""
  
+ #  FIXME Clash between 126a and 130!!
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15150,15164 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr ""
  
  # FIXME This may be wrong. check context.
--- 15148,15162 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr "試壓片 (test pressing)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr "假漆版唱片（大量製造者）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr "塑膠版唱片（大量製造者）"
  
  # FIXME This may be wrong. check context.
***************
*** 15242,15246 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
--- 15240,15244 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr "大量製造者（商業性發行唱片多屬此）(mass produced)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
***************
*** 18891,18895 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
--- 18889,18893 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr "唱片、錄音帶或圓形錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
***************
*** 18899,18903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
--- 18897,18901 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr "質料種類："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
***************
*** 18911,18915 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9
--- 18909,18913 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr "錄音槽切割形式："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9




From acli at users.sourceforge.net  Mon Jan 24 07:53:56 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:53:56 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Csy6m-00067h-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23504

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
--- default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
***************
*** 19653,19659 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
- #, fuzzy
  msgid "Waited"
! msgstr "相關"
  
  #. INPUT type=submit
--- 19653,19658 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
  msgid "Waited"
! msgstr "等待"
  
  #. INPUT type=submit
***************
*** 19786,19794 ****
  msgstr "是"
  
- # FIXME Bug in English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
- #, fuzzy
  msgid "Year"
! msgstr "年%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
--- 19785,19791 ----
  msgstr "是"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
  msgid "Year"
! msgstr "年份"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
***************
*** 20023,20030 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
- #, fuzzy
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "「私人」的虛擬書架只有您看得見，並且只有您才有權修改。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
--- 20020,20027 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "私家書架只有您看得見，並且只有您才有權修改。"
  
+ #  FIXME bug in tokenizer/scanner
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
***************
*** 20053,20056 ****
--- 20050,20054 ----
  "Thompson,"
  msgstr ""
+ "及 Simon Blake、運作經理 Amanda Atkins、Olwen Williams、Finlay Thompson、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90
***************
*** 20088,20094 ****
  msgstr "截至此日 <i>(%s)</i>"
  
- #  XXX 暫譯，要問人核對
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/authorities/authorities.tmpl:1
- #, fuzzy
  msgid "authority help"
  msgstr "權威說明"
--- 20086,20090 ----
***************
*** 20101,20107 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
- #, fuzzy
  msgid "autre"
! msgstr "著者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
--- 20097,20102 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
  msgid "autre"
! msgstr "其他"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
***************
*** 20127,20131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "在第「-1」格 (即不顯示)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
--- 20122,20126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "在第「-1」格（即不顯示）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
***************
*** 20216,20222 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
- #, fuzzy
  msgid "catalogue details"
! msgstr "館藏查詢"
  
  #. For the first occurrence,
--- 20211,20216 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
  msgid "catalogue details"
! msgstr "目錄詳情"
  
  #. For the first occurrence,
***************
*** 20229,20235 ****
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
- #, fuzzy
  msgid "change status"
! msgstr "匯率"
  
  #. SCRIPT
--- 20223,20228 ----
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
  msgid "change status"
! msgstr "修改狀態"
  
  #. SCRIPT
***************
*** 20240,20246 ****
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, fuzzy, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr "%S - %s <a1>+</a>"
  
  #. INPUT type=reset name=reset
--- 20233,20239 ----
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr ""
  
  #. INPUT type=reset name=reset
***************
*** 20276,20282 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
- #, fuzzy
  msgid "count"
! msgstr "折扣"
  
  #. SCRIPT
--- 20269,20274 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
  msgid "count"
! msgstr "數量"
  
  #. SCRIPT
***************
*** 20286,20292 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
- #, fuzzy
  msgid "day"
! msgstr "繳交"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
--- 20278,20283 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
  msgid "day"
! msgstr "日"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
***************
*** 20376,20380 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
--- 20367,20371 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr "任何地方"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
***************
*** 20401,20407 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
- #, fuzzy
  msgid "filter"
! msgstr "印表機"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
--- 20392,20397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
  msgid "filter"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
***************
*** 20412,20418 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, fuzzy, c-format
  msgid "for branch = %s"
! msgstr "登記之館別：%s"
  
  #. %1$s: TMPL_VAR name=borrower_category
--- 20402,20408 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=borrower_category
***************
*** 20510,20514 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
- #, fuzzy
  msgid "ignored"
  msgstr "忽略"
--- 20500,20503 ----
***************
*** 20669,20673 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
  msgid "mandatory tags empty"
  msgstr "個必備欄沒有填寫"
--- 20658,20661 ----
***************
*** 20727,20733 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
- #, fuzzy
  msgid "month"
! msgstr "金額"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
--- 20715,20720 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
  msgid "month"
! msgstr "月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
***************
*** 20848,20852 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=name
--- 20835,20839 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr "或新增至新的虛擬書架"
  
  #. %1$s: TMPL_VAR name=name
***************
*** 20881,20887 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
- #, fuzzy
  msgid "plans"
! msgstr "Al Banks"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
--- 20868,20873 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
  msgid "plans"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
***************
*** 20899,20903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr ""
  
  #. SCRIPT
--- 20885,20889 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr "彈出通知"
  
  #. SCRIPT
***************
*** 20952,20958 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
- #, fuzzy
  msgid "quarter"
! msgstr "更新"
  
  #. SCRIPT
--- 20938,20943 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
  msgid "quarter"
! msgstr "季"
  
  #. SCRIPT
***************
*** 21045,21051 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, fuzzy, c-format
  msgid "see also : %s,"
! msgstr "參見"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
--- 21030,21036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, c-format
  msgid "see also : %s,"
! msgstr "參見：%s、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
***************
*** 21059,21065 ****
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, fuzzy, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1></a>%2$s 的購物籃 %1$s"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
--- 21044,21050 ----
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1>%2$s</a> 的購物籃 <b>%1$s</b>"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
***************
*** 21090,21096 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
- #, fuzzy
  msgid "subfield ignored"
! msgstr "分欄"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
--- 21075,21080 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
  msgid "subfield ignored"
! msgstr "分欄已被忽略"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
***************
*** 21159,21163 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype欄必須："
  
  #  NOTE 譯文更動 by Arthur
--- 21143,21147 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype 欄必須："
  
  #  NOTE 譯文更動 by Arthur
***************
*** 21185,21193 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch欄必須："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch欄必須"
  
  #  NOTE 譯文更動 by Arthur
--- 21169,21177 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch 欄必須："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch 欄必須"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 21289,21293 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "週刊"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
--- 21273,21277 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "週"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
***************
*** 21309,21313 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "年刊"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
--- 21293,21297 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "年"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16




From acli at users.sourceforge.net  Mon Jan 24 08:13:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:13:57 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35.2.1,1.35.2.2
Message-ID: <E1CsyQ9-0007JT-Mu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28051

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
Reverting the patch


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C2 -r1.35.2.1 -r1.35.2.2
*** TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
--- TmplTokenizer.pm	24 Jan 2005 07:13:54 -0000	1.35.2.2
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,354 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;
--- 349,353 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Mon Jan 24 08:57:40 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:57:40 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.3,1.4.2.4 default_intranet_zh_TW.po,1.4.2.5,1.4.2.6
Message-ID: <E1Csz6S-0001Mu-6P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5164

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Unimarc tag 130 done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 18,21 ****
--- 18,28 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ # TODO
+ #. SCRIPT
+ #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+ #, fuzzy
+ msgid " Biblio(s) added"
+ msgstr "成功新增書目"
+ 
  #. %1$S: type=text name=value
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
***************
*** 799,808 ****
  msgstr "書籃"
  
- # TODO
- #. SCRIPT
- #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- msgid "Biblio(s) added"
- msgstr "成功新增書目"
- 
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
  msgid "Bookshelves"
--- 806,809 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
--- default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 34,37 ****
--- 34,52 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory fields empty (see bold subfields)"
+ msgstr "個必備欄位沒有填寫（見粗體的分欄）"
+ 
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory tags empty"
+ msgstr "個必備欄沒有填寫"
+ 
  #. %1$s: TMPL_VAR name=subject
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:6
***************
*** 81,85 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
--- 96,100 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
***************
*** 91,95 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
--- 106,110 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
***************
*** 107,111 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
--- 122,126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr "#230||{ ; 230a}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
***************
*** 117,121 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
--- 132,136 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr "#700|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
***************
*** 135,139 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr ""
  
  #. %1$S: type=text name=seealso
--- 150,154 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr "%S (以 200a 而言，例如：「200c」、「200d」、「200e」)"
  
  #. %1$S: type=text name=seealso
***************
*** 736,740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:55
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:56
- #, fuzzy
  msgid "&nbsp;No results found."
  msgstr "　找不到您需用的資料。"
--- 751,754 ----
***************
*** 784,788 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:17
- #, fuzzy
  msgid ""
  "(Note : fines are calculated by the fines2.pl script, located in misc "
--- 798,801 ----
***************
*** 818,824 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, fuzzy, c-format
  msgid "(is %s)"
! msgstr "(%s, %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
--- 831,837 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, c-format
  msgid "(is %s)"
! msgstr "(為 %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
***************
*** 971,982 ****
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
- #, fuzzy
  msgid "1/2 Monthes"
! msgstr "個月%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
--- 984,994 ----
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
  msgid "1/2 Monthes"
! msgstr "半個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr "半個月"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
***************
*** 989,993 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
--- 1001,1005 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr "半季"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
***************
*** 995,999 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
--- 1007,1011 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr "半週"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
***************
*** 1001,1005 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "1/2 年"
  
  # FIXME looks like a BUG in the English template
--- 1013,1017 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "半年"
  
  # FIXME looks like a BUG in the English template
***************
*** 1082,1086 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
--- 1094,1098 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr "105 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
***************
*** 1134,1138 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
--- 1146,1150 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr "16 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
***************
*** 1211,1215 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
--- 1223,1227 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr "3 × 5 吋（8 × 13 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
***************
*** 1236,1240 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
--- 1248,1252 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr "35 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
***************
*** 1251,1255 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
--- 1263,1267 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr "4 × 6 吋（11 × 15 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
***************
*** 1296,1300 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
--- 1308,1312 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr "6 × 9 吋（16 × 23 公分）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
***************
*** 1331,1335 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
--- 1343,1347 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr "70 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
--- 1353,1357 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr "8 米厘（微縮捲片）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
***************
*** 1358,1365 ****
  msgstr "8/10 吋/秒"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr ""
  
  #. For the first occurrence,
--- 1370,1378 ----
  msgstr "8/10 吋/秒"
  
+ #  NOTE CMARC 亂寫 :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr "3 1/4 × 7 3/8 吋（9 × 19 公分）（孔卡）"
  
  #. For the first occurrence,
***************
*** 4066,4070 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
--- 4079,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr "長條微縮片 (microfilm slip)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
***************
*** 5019,5023 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
--- 5032,5036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr "孔卡 (aperture card)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
***************
*** 6070,6074 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
--- 6083,6087 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr "發行片 (service copy)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
***************
*** 6156,6167 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
- #, fuzzy
  msgid "Couleur"
! msgstr "重設"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
- #, fuzzy
  msgid "Couleur:"
! msgstr "重設"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
--- 6169,6178 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
  msgid "Couleur"
! msgstr "彩色 (color)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
  msgid "Couleur:"
! msgstr "色彩："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
***************
*** 6919,6923 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
--- 6930,6934 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr "重氮 (diazo)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
***************
*** 6957,6961 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
--- 6968,6972 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr "大小尺寸："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
***************
*** 7027,7033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
- #, fuzzy
  msgid "Divers"
! msgstr "-> 交貨"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
--- 7038,7043 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
  msgid "Divers"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
***************
*** 7405,7409 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
--- 7415,7419 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr "高縮率（31–60倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
***************
*** 7424,7433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
--- 7434,7443 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr "軟片感光乳劑性質："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr "不詳"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
***************
*** 7910,7916 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
- #, fuzzy
  msgid "Faible reduction"
! msgstr "複製品"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
--- 7920,7925 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
  msgid "Faible reduction"
! msgstr "低縮率"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
***************
*** 8489,8500 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
- #, fuzzy
  msgid "Generation (copies):"
! msgstr "一般備註："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
--- 8498,8508 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
  msgid "Generation (copies):"
! msgstr "軟片版類別 (generation)："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr "混合"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
***************
*** 9227,9231 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
--- 9235,9239 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr "非安全軟片基底"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
***************
*** 11783,11787 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
--- 11791,11795 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr "不透明微縮片 (micro opaque)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
***************
*** 11793,11817 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
--- 11801,11825 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr "微縮單片 (microfiche)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr "卡式微縮單片 (microfiche cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr "盤式微縮捲片 (microform reel)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr "匣式微縮捲片 (microform cartridge)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr "卡式微縮捲片 (microform cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
***************
*** 12076,12082 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
- #, fuzzy
  msgid "Monochrome"
! msgstr "電話 (住宅)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
--- 12084,12089 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
  msgid "Monochrome"
! msgstr "單色 (monochrome)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
***************
*** 12368,12372 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
--- 12375,12379 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr "負片 (negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
***************
*** 13198,13202 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
--- 13205,13209 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr "正常縮率（16–30倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
***************
*** 13280,13284 ****
  "directory."
  msgstr "注意：罰款係由位於 misc 目錄內的 fines2.pl 計算。"
!  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
--- 13287,13291 ----
  "directory."
  msgstr "注意：罰款係由位於 misc 目錄內的 fines2.pl 計算。"
! 
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
***************
*** 14868,14872 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
--- 14875,14879 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr "含正負兩極 (mixed polarity)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
***************
*** 14923,14929 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
- #, fuzzy
  msgid "Polarite:"
! msgstr "印表機"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
--- 14930,14935 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
  msgid "Polarite:"
! msgstr "極性："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
***************
*** 15027,15033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
- #, fuzzy
  msgid "Positif"
! msgstr "職位"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
--- 15033,15038 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
  msgid "Positif"
! msgstr "正片 (positive)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
***************
*** 15121,15125 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
--- 15126,15130 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr "母片"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
***************
*** 15133,15137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15138,15142 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "唱片、錄音帶或圓型錄音筒類型 / 資料特殊類型："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15424,15433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
- #, fuzzy
  msgid "Rapport de reduction:"
! msgstr "複製品"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
--- 15429,15437 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr "閱讀放大倍率"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
  msgid "Rapport de reduction:"
! msgstr "縮率："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
***************
*** 15684,15696 ****
  msgstr ""
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
- msgid "Renseignement techniques sur la musique"
- msgstr "音樂作品之技術資料"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:505
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:507
--- 15688,15691 ----
***************
*** 15739,15747 ****
--- 15734,15748 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:490
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:576
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:662
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:748
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:834
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:920
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
  msgid "Renseignements techniques sur la musique"
  msgstr "音樂作品之技術資料"
***************
*** 16484,16488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
--- 16485,16489 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr "銀鹽 (silver halide)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
***************
*** 17461,17465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
--- 17462,17466 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr "軟片基底："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
***************
*** 17470,17474 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
--- 17471,17475 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr "安全軟片基底"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
***************
*** 18394,18400 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
- #, fuzzy
  msgid "Tirage"
! msgstr "欄"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
--- 18395,18400 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
  msgid "Tirage"
! msgstr "複製用母片 (printing master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
***************
*** 18743,18747 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
--- 18743,18747 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr "極高縮率（61–90 倍）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
***************
*** 19127,19131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr ""
  
  #  NOTE 譯文更動 by Arthur
--- 19127,19131 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr "超高縮率（91倍–）"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 19426,19430 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
--- 19426,19430 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr "重泡 (vesicular)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
***************
*** 20402,20406 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
  msgstr ""
--- 20402,20406 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, c-format
  msgid "for branch = %s"
  msgstr ""
***************
*** 20645,20664 ****
  msgstr "下限*"
  
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
- msgid "mandatory fields empty (see bold subfields)"
- msgstr "個必備欄位沒有填寫（見粗體的分欄）"
- 
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- msgid "mandatory tags empty"
- msgstr "個必備欄沒有填寫"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
  msgid "means : find biblio that have a"
--- 20645,20648 ----
***************
*** 21950,21953 ****
--- 21934,21940 ----
  #~ msgstr "關係*"
  
+ #~ msgid "Renseignement techniques sur la musique"
+ #~ msgstr "音樂作品之技術資料"
+ 
  #~ msgid "Rep"
  #~ msgstr "可重覆"




From acli at users.sourceforge.net  Mon Jan 24 09:12:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:12:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1,1.1.2.1
Message-ID: <E1CszL7-0002SI-Td@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Disambiguation for CMARC


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_116.tmpl	7 Jun 2004 09:50:40 -0000	1.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
***************
*** 219,223 ****
  
  	<tr>
! 		<td>Couleur</td>
  		<td>
  			<select name="f4" size="1">
--- 219,223 ----
  
  	<tr>
! 		<td>Couleur:</td>
  		<td>
  			<select name="f4" size="1">




From acli at users.sourceforge.net  Mon Jan 24 09:14:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:14:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CszNB-0002Zr-W5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9883

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:14:55 -0000	1.1.2.2
***************
*** 342,346 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 342,346 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 541,545 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 541,545 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 741,745 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 741,745 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->




From acli at users.sourceforge.net  Mon Jan 24 10:00:52 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:00:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.6,1.4.2.7
Message-ID: <E1Ct05c-0005HU-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20194

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly copied from CMARC


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
--- default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
***************
*** 2506,2509 ****
--- 2506,2510 ----
  msgstr "採購"
  
+ #  FIXME 台灣真是這樣叫嗎？好恐怖呀，「膠彩」好得多了……
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:438
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:440
***************
*** 2513,2517 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:839
  msgid "Acrylique"
[...1243 lines suppressed...]
  msgid "Tirage photographique"
! msgstr "照片 (photoprint)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:231
***************
*** 18584,18590 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
- #, fuzzy
  msgid "Toile"
! msgstr "題名"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016
--- 18542,18547 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
  msgid "Toile"
! msgstr "帆布"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016




From acli at users.sourceforge.net  Mon Jan 24 10:31:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:31:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.7,1.4.2.8
Message-ID: <E1Ct0ZC-0007GS-S5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27788

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -C2 -r1.4.2.7 -r1.4.2.8
*** default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
--- default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
***************
*** 7664,7670 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
- #, fuzzy
  msgid "Error 401"
! msgstr "錯誤：%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:5
--- 7664,7669 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
[...1547 lines suppressed...]
  msgid "Nocturnes"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:58
***************
*** 12792,12798 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
- #, fuzzy
  msgid "Non-applicable"
! msgstr "(如適用)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604
--- 12690,12695 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
  msgid "Non-applicable"
! msgstr "不適用"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604




From slef at users.sourceforge.net  Mon Jan 24 14:25:06 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:25:06 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88,1.88.2.1
Message-ID: <E1Ct4DK-0006S1-4Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24709

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
porting changes from 2.0.x

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -C2 -r1.88 -r1.88.2.1
*** Install.pm	5 Jan 2005 14:31:17 -0000	1.88
--- Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 27,33 ****
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
  require Exporter;
  
--- 27,34 ----
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! #use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
+ use File::Temp qw/ :mktemp /;
  require Exporter;
  
***************
*** 61,64 ****
--- 62,66 ----
  		&getmessage
  		&showmessage
+ 		&completeupgrade
  		&releasecandidatewarning
  		&getinstallationdirectories
***************
*** 86,90 ****
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
--- 88,92 ----
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser $httpdgroup );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
***************
*** 107,114 ****
  =cut
  
! my $termios = POSIX::Termios->new();
! $termios->getattr();
! my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n";
  
  sub heading ($) {
--- 109,116 ----
  =cut
  
! #my $termios = POSIX::Termios->new();
! #$termios->getattr();
! #my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
  
  sub heading ($) {
***************
*** 119,123 ****
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`;
  chomp($mytmpcnf);
  
--- 121,125 ----
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = mktemp("my.cnf.koha.XXXXXX");
  chomp($mytmpcnf);
  
***************
*** 127,138 ****
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: 
! * where most koha files should be stored (you can set the prefix environment variable for this);
! * the username and password of a mysql superuser; 
! * Details of your library setup. 
! * Details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for multiple Koha versions on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
--- 129,139 ----
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: where most koha files should be stored (you can set
! the prefix environment variable for this); the username and password of
! a mysql superuser; and details of your library setup.  You may also need
! to know details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for installing not as root, or to have many Kohas on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 150,154 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 262,269 ****
--- 263,274 ----
  $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq|
  Congratulations ... your Koha installation is complete!
+ 
  You will be able to connect to your Librarian interface at:
+ 
     http://%s\:%s/
+ 
     use the koha admin mysql login and password to connect to this interface.
  and the OPAC interface at:
+ 
     http://%s\:%s/
     
***************
*** 283,286 ****
--- 288,305 ----
  
  #'
+ 
+ =item completeupgrade
+ 
+    completeupgrade
+ 
+ Display a message describing what may need changing in httpd.conf
+ and any other instructions
+ 
+ =cut
+ 
+ sub completeupgrade {
+ 	showmessage(getmessage('UpgradeCompleted',[$intranetdir,$intranetdir,$intranetdir,$opacdir,$opacdir,$intranetdir]),'PressEnter');
+ }
+ 
  sub releasecandidatewarning {
      my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
***************
*** 290,294 ****
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements','');
  	print $message."\n";
  	exit;
--- 309,313 ----
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements');
  	print $message."\n";
  	exit;
***************
*** 375,378 ****
--- 394,398 ----
  Sets the sysconfdir, normally /etc.
  This should be an absolute path; a trailing / is not required.
+ Must be writeable, else we die.
  
  =cut
***************
*** 380,383 ****
--- 400,404 ----
  sub setetcdir ($) {
      ($etcdir) = @_;
+     if (! ((-d $etcdir) && (-w $etcdir))) { die("Cannot write to $etcdir! Please set the etcdir environment variable to a writeable directory.\nFailed"); }
  }
  
***************
*** 933,937 ****
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; } #"
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
--- 954,958 ----
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; }
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
***************
*** 1026,1030 ****
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") { #"
  	    $mysqldir=$mysql;
         }
--- 1047,1051 ----
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") {
  	    $mysqldir=$mysql;
         }
***************
*** 1303,1307 ****
--- 1324,1330 ----
  NOTE: You will need to add lines to your main httpd.conf to
  include %s/koha-httpd.conf
+ (using the Include directive)
  and to make sure it is listening on the right ports
+ and host names
  (using the Listen directive).
  
***************
*** 1463,1466 ****
--- 1486,1497 ----
  	print SITE <<EOP
  
+ # Koha 2.2 Apache Virtual Host Config File
+ #
+ # Please include this file in your apache configuration.
+ # The best way to do that depends on your site setup.
+ # Some like an Include adding to /etc/apache/httpd.conf
+ # and some prefer a symlink to this file from some dir.
+ # Please refer to your system manuals.
+ 
  # Ports to listen to for Koha
  # uncomment these if they aren't already in main httpd.conf
***************
*** 1469,1472 ****
--- 1500,1505 ----
  
  # NameVirtualHost is used by one of the optional configurations detailed below
+ # Please make sure this line is correct before uncommenting.
+ # See http://httpd.apache.org/docs/vhosts/ for some guides.
  
  #NameVirtualHost 11.22.33.44
***************
*** 1478,1481 ****
--- 1511,1515 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
+    Redirect permanent index.html http://$servername\:$opacport/cgi-bin/koha/opac-main.pl
     ErrorLog $logfiledir/opac-error_log
     TransferLog $logfiledir/opac-access_log
***************
*** 1491,1494 ****
--- 1525,1529 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ "$intranetdir/cgi-bin/"
+    Redirect permanent index.html http://$servername\:$intranetport/cgi-bin/koha/mainpage.pl
     ErrorLog $logfiledir/koha-error_log
     TransferLog $logfiledir/koha-access_log




From slef at users.sourceforge.net  Mon Jan 24 14:34:23 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:34:23 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.1,1.88.2.2
Message-ID: <E1Ct4MJ-00071J-0g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26955

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
database must be last parameter to bin/mysql in some version

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -C2 -r1.88.2.1 -r1.88.2.2
*** Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
--- Install.pm	24 Jan 2005 13:34:19 -0000	1.88.2.2
***************
*** 1806,1811 ****
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1806,1811 ----
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
! 	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
***************
*** 1951,1957 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='lp';
--- 1951,1957 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1972,1976 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  	}
  	my $language;
--- 1972,1976 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1982,1986 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1982,1986 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {




From slef at users.sourceforge.net  Mon Jan 24 20:37:58 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 11:37:58 -0800
Subject: [Koha-cvs] CVS: koha/misc/info INSTALL,NONE,1.1.2.1 ChangeLog,1.1,1.1.4.1 README,1.2,1.2.4.1
Message-ID: <E1CtA2A-000630-60@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/info
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23168

Modified Files:
      Tag: rel_2_2
	ChangeLog README 
Added Files:
      Tag: rel_2_2
	INSTALL 
Log Message:
Instructions and friends from 2.0

--- NEW FILE ---
Koha release 2.0.1 (stable series, first point release)
28 August 2004 MJR

Koha is distributed under the GNU GPL. Please read the file LICENSE for
more details.

To install the system please run: perl installer.pl

This will:
 1. Check for missing perl modules;
 2. Ask some questions and run some programs to collect system information;
 3. Write an apache httpd.conf file;
 4. Copy koha to the installation directory;
 5. Create a mysql database and load in basic data;
 6. Offer to try restarting apache;
 7. Invite you to fill in a survey from koha's developers.

perl 5.6.1 or higher is required.

The perl modules required are:
  DBI, Date::Manip, DBD::mysql, HTML::Template, Digest::MD5,
  MARC::Record, Mail::Sendmail, Event
Optionally, we can also use:
  Net::Z3950
You can install packages for these, or CPAN builds. The installer will
suggest CPAN builds, but it's your choice.

After installation, you need to make sure the generated koha-httpd.conf
file is "Include"d into your apache configuration and restart apache.
You may also need to configure daemons, depending on your installation.

A common need is to add the fines2.pl script to crontab. You will need
to put perl -I/path/to/koha/intranet/modules /path/to/fines2.pl, so
that it can find the koha modules.

If you wish to install without being root, please set the "etcdir" and
"prefix" environment variables before running the installer. etcdir
will be the configuration directory and prefix will be the installation
root directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** ChangeLog	22 Nov 2002 09:09:35 -0000	1.1
--- ChangeLog	24 Jan 2005 19:37:39 -0000	1.1.4.1
***************
*** 1,2 ****
--- 1,181 ----
+ 2004-11-17 13:03:42 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.2
+ 
+     Summary:
+       2.0.2 release update
+ 
+     README: updated version number, noted mod_perl unsafe
+     
+     modified files:
+      README
+ 
+ 
+ 2004-11-05 12:02:53 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1-patch-9
+ 
+     Summary:
+       Bugfixes
+ 
+     modules/C4/Maintenance.pm
+       Removed superfluous quote() calls after Chris spotted it in 2.1
+       Might fix some catmaint.pl problems.
+     
+     koha.version
+       2.0.2
+     
+     modified files:
+      koha.version modules/C4/Maintainance.pm
+ 
+ 
+ 2004-10-29 19:52:14 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1
+ 
+     Summary:
+       small bugfixes
+     Revision:
+ 
+     C4::Biblio bugfix from Paul Poulain:
+       drop empty fields, but NOT fields containing 0
+     
+     Remove spanish language option:
+       will be readded when translators answer email
+     
+     README:
+       add comment about fines2.pl
+     
+     Fix for bug 789:
+       shedges: patch -F 3 modules/C4/Search.pm BorrSearchPatch.txt
+ 
+     modified files:
+      INSTALL Install.pm modules/C4/Biblio.pm modules/C4/Search.pm
+ 
+ 
+ 2004-08-27 23:37:02 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-7
+ 
+     Summary:
+       Add release docs
+ 
+     2.0.1 release documentation
+     
+ 
+     new files:
+      INSTALL
+ 
+     modified files:
+      README
+ 
+ 
+ 2004-08-24 18:33:51 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-6
+ 
+     Summary:
+       Fix bug 816
+ 
+     Fixes bugs.koha.org 816 - use httpd config instead of meta redirect
+ 
+     modified files:
+      Install.pm
+ 
+ 
+ 2004-07-28 23:19:07 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-5
+ 
+     Summary:
+       Add kohaRHinstall
+ 
+     Slightly modified version of this, with Stephen's blessing. Probably
+     needs updating before release, if possible.
+     
+ 
+     new files:
+      docs/KohaRHinstall.html
+ 
+ 
+ 2004-07-28 23:18:06 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-4
+ 
+     Summary:
+       Bugfixes (esp. statistics/reports) and documentation
+ 
+     Complete bug 791 limit fix in C4::Authorities and C4::Maintainance, thanks to Kris Boutilier
+     
+     Check etcdir can be written to, in setetcdir.
+     
+     Added docs/installing_koha_on_debian.html from Joshua (GPL)
+     
+     Added optional parameter to C4::Stats::unfilledreserves to only select today's reserves
+     
+     Used unused parameter $time in intranet-cgi/reservereport.pl to only select today's reserves
+     
+     Updated reports/reports-home.tmpl
+     
+     Added reports/activity.tmpl
+     
+     Added missing function C4::Stats:statsreport
+     
+     Added intranet-cgi/reports/activity.pl
+ 
+     new files:
+      docs/installing_koha_on_debian.html docs/sources.txt
+      intranet-cgi/reports/activity.pl
+      intranet-html/intranet-tmpl/default/en/reports/activity.tmpl
+ 
+     modified files:
+      Install.pm intranet-cgi/reservereport.pl
+      intranet-html/intranet-tmpl/default/en/reports/reports-home.tmpl
+      modules/C4/Authorities.pm modules/C4/Circulation/Fines.pm
+      modules/C4/Maintainance.pm modules/C4/Stats.pm
+      opac-cgi/opac-new.pl
+ 
+ 
+ 2004-06-30 15:36:28 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-3
+ 
+     Summary:
+       Brown paper bag upgrade/Install fixes
+ 
+     Removed $etcdir from koha.upgrade (no longer needed)
+     
+     Added typo-removed $ to Install.pm
+     
+     modified files:
+      Install.pm koha.upgrade
+ 
+ 
+ 2004-06-30 15:13:48 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-2
+ 
+     Summary:
+       Bugfixes
+ 
+     Fix perldoc C4::Search
+     
+     Fix search parameter display bug 196
+     
+     Half-fix thesaurus word search bug 791 - thanks to M. Parienti
+     
+     Fix member.pl search bug 789
+     
+     removed files:
+      scripts/misc/my.cnf.koha.jsqrGh
+ 
+     modified files:
+      intranet-cgi/admin/thesaurus.pl modules/C4/Search.pm
+      opac-html/opac-tmpl/css/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/de/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/pl/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
+      opac-html/opac-tmpl/vanilla/en/opac-searchresults.tmpl
+ 
+ 
+ 2004-06-30 12:15:25 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-1
+ 
+     Summary:
+       Installation bugfixes
+ 
+     Fix mysql command syntax in Install.pm (database must be after -e in some v3)
+     
+     Removed FIXMEs from upgradecomplete by moving message inside Install.pm
+     
+     Fixed koha.upgrade mysql password handling
+     
+     Removed duplicate restoremycnf() calls from Install.pm - this is installer.pl's concern
+ 
+ 
  2002-10-30  Andrew Arensburger  <arensb at baa.ooblick.com>
  

Index: README
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/README,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** README	20 Jan 2003 03:40:03 -0000	1.2
--- README	24 Jan 2005 19:37:50 -0000	1.2.4.1
***************
*** 1,7 ****
! 19/7/00 chris at katipo.co.nz
  
! Koha is distributed under the GPL license, please read the file LICENSE for
  more details.
  
! To install the system please run installer.pl
  
--- 1,16 ----
! Koha release 2.0.2 (2.0 stable series, second point release)
! 17 November 2004 MJR
  
! Koha is distributed under the GNU GPL. Please read the file LICENSE for
  more details.
  
! To install the system, please see the INSTALL file.
! 
! To upgrade an existing system, please run: perl koha.upgrade
! 
! Please report any bugs to the koha mailing lists or bug tracker and we
! will try to fix them in a future release if possible. The main koha web
! site is http://www.koha.org/
! 
! Running under mod_perl is not advised for this version.
  




From oleonard at users.sourceforge.net  Mon Jan 24 21:42:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 12:42:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.1,1.6.2.2
Message-ID: <E1CtB2S-0001oL-25@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6814/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Formatting subscription start date in get_subscription_list_from_biblionumber according to system preference

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
--- Bull.pm	24 Jan 2005 20:41:47 -0000	1.6.2.2
***************
*** 177,180 ****
--- 177,181 ----
  	my @res;
  	while (my $subs = $sth->fetchrow_hashref) {
+ 		$subs->{'startdate'} = format_date($subs->{'startdate'});
  		push @res,$subs;
  	}




From oleonard at users.sourceforge.net  Mon Jan 24 22:59:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 13:59:57 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CtCFZ-0005y9-Ao@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22780/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding biblionumber to output variables so that link back to biblio works.

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
--- opac-serial-issues.pl	24 Jan 2005 21:59:12 -0000	1.1.2.2
***************
*** 33,36 ****
--- 33,37 ----
  
  $template->param(
+ 	biblionumber => $query->param('biblionumber'),
  	subscription_LOOP => $subscriptions
  # 	startdate => format_date($subscription->{startdate}),




From oleonard at users.sourceforge.net  Mon Jan 24 23:08:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:08:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.1,1.15.2.2
Message-ID: <E1CtCNM-0006Nq-Um@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
--- opac-detail.tmpl	24 Jan 2005 22:07:11 -0000	1.15.2.2
***************
*** 47,51 ****
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 47,51 ----
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:12:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:12:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.16
Message-ID: <E1CtCRW-0006bq-4N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25326/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	24 Jan 2005 22:11:54 -0000	1.16
***************
*** 46,51 ****
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 46,51 ----
  		<tr>
  			<td>
! <!-- TMPL_IF name="subtitle" --><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:52:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:52:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-serial-issues.tmpl,NONE,1.1 opac-ISBDdetail.tmpl,1.1,1.2 opac-MARCdetail.tmpl,1.1,1.2 opac-detail.tmpl,1.1,1.2
Message-ID: <E1CtD4U-0000mf-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2852/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-ISBDdetail.tmpl opac-MARCdetail.tmpl opac-detail.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl opac-serial-issues.tmpl 
Log Message:
Synching with default tempalte, other cosmetic changes

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Subscription Details
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->

<div id="main">

<h1>Subscription Details</h1>
<div class="table details">
<!-- TMPL_LOOP name="subscription_LOOP" -->
	<table>
	<caption><em><!-- TMPL_VAR name="bibliotitle" --></em></caption>
	<tr><th>Details:</th><td><p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every <b> <!--TMPL_IF name="periodicity1" --> day <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity2" --> week <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity3" --> 2 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity4" --> 3 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity5" --> month <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity6" --> 2 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity7" --> 3 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity8" --> quarter <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity9" --> 2 quarters <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity10" --> year <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity11" --> 2 years <!-- /TMPL_IF --> </b> on <b> <!--TMPL_IF name="arrival1" --> 	Monday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival2" --> Tuesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival3" --> Wednesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival4" --> Thursday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival5" --> Friday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival6" --> Saturday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival7" --> Sunday <!-- /TMPL_IF --> </b> for <b> 	<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF --> 	<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF --> 	<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF --> 	</b> since <b><!-- TMPL_VAR name="startdate" --></b> </p></td></tr>
<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR name="notes" --></td></tr><!-- /TMPL_IF -->
<!-- TMPL_IF name="opacnotes" --><tr><th>Issues summary</th><td><!-- TMPL_VAR name="opacnote" --></td></tr><!-- /TMPL_IF -->
	</table><!-- /TMPL_LOOP -->
</div>
<form action="/cgi-bin/koha/opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><p><input type="submit" class="submit" value="Back to Normal View" /></p></form>

</div>
</body>
</html>



Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	24 Jan 2005 22:51:51 -0000	1.2
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-MARCdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-MARCdetail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 6,22 ****
  <div id="main">
  <h2>MARC View</h2>
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="brief" value="Normal View" /></form>
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
! <form class="inline"><input type="submit" class="cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
--- 6,22 ----
  <div id="main">
  <h2>MARC View</h2>
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" /></form>
  
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
***************
*** 120,124 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	
  		<table>
  		<caption>Copies</caption>
--- 120,124 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! <!-- TMPL_IF NAME="item_header_loop" -->
  		<table>
  		<caption>Copies</caption>
***************
*** 135,139 ****
--- 135,143 ----
  					</tr>
  				<!-- /TMPL_LOOP -->
+ 		</table><!-- TMPL_ELSE -->
+ 		<table>
+ 			<tr><td>No copies available.</td></tr>
  		</table>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 35,43 ****
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
--- 35,41 ----
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
***************
*** 72,86 ****
  	</table>
  
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
! <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
--- 70,87 ----
  	</table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
  
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
***************
*** 112,115 ****
--- 113,119 ----
  <table><tr><td>No copies available.</td></tr></table>
  <!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="subscriptionsnumber" -->
+ 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>




From oleonard at users.sourceforge.net  Mon Jan 24 23:54:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:54:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.2
Message-ID: <E1CtD63-0000sU-HT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3261/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding styles for more input buttons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	24 Jan 2005 22:54:02 -0000	1.2
***************
*** 518,521 ****
--- 518,533 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Mon Jan 24 23:55:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:55:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images addtoshelf.gif,NONE,1.1 isbd.gif,NONE,1.1 placereserve.gif,NONE,1.1 addtobasket.gif,1.1,1.2 basket.gif,1.1,1.2 clearbasket.gif,1.1,1.2
Message-ID: <E1CtD7R-0000wi-Ij@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3485/koha-tmpl/opac-tmpl/npl/en/images

Modified Files:
	addtobasket.gif basket.gif clearbasket.gif 
Added Files:
	addtoshelf.gif isbd.gif placereserve.gif 
Log Message:
Adding and updating input button images

--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
Index: addtobasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/addtobasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsVA8MFf and /tmp/cvsuQkGMD differ

Index: basket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/basket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsYU6vAC and /tmp/cvsuauCKd differ

Index: clearbasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/clearbasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvs4fJPY7 and /tmp/cvsOQuiCM differ




From acli at users.sourceforge.net  Tue Jan 25 04:47:04 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 19:47:04 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.8,1.4.2.9
Message-ID: <E1CtHfU-0006eQ-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25498

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -r1.4.2.8 -r1.4.2.9
*** default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
--- default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
***************
*** 25,29 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
--- 25,29 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
[...1111 lines suppressed...]
- #, fuzzy
  msgid "Overdue charges"
! msgstr "過期圖書資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
--- 13865,13870 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:14
  msgid "Overdue charges"
! msgstr "過期罰款"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
***************
*** 13956,13960 ****
  #  NOTE 字義係由Simon Blake在#koha提供
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:37
- #, fuzzy
  msgid "P&amp;P"
  msgstr "運費"
--- 13895,13898 ----




From acli at users.sourceforge.net  Tue Jan 25 05:54:36 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:54:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_100.tmpl,1.3,1.3.2.1
Message-ID: <E1CtIiq-0001lo-E4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6781

Modified Files:
      Tag: rel_2_2
	unimarc_field_100.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** unimarc_field_100.tmpl	7 Jun 2004 09:46:36 -0000	1.3
--- unimarc_field_100.tmpl	25 Jan 2005 04:54:33 -0000	1.3.2.1
***************
*** 304,308 ****
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municiapal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->
--- 304,308 ----
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municipal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->




From acli at users.sourceforge.net  Tue Jan 25 05:57:34 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:57:34 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.9,1.4.2.10
Message-ID: <E1CtIli-0001w4-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7379

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly unimarc tag 100 related


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -r1.4.2.9 -r1.4.2.10
*** default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
--- default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
***************
*** 2971,2977 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
- #, fuzzy
  msgid "Allegorie"
! msgstr "類別"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:58
--- 2971,2976 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
[...980 lines suppressed...]
  #. INPUT type=submit
--- 20732,20736 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:50
  msgid "reproduction"
! msgstr "重印本、影印本、影鈔本、翻印本"
  
  #. INPUT type=submit
***************
*** 20799,20803 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr ""
  
  #  NOTE「See」中文譯「見」，「See also」中文譯「參見」，請勿改動
--- 20783,20787 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr "學齡兒童，5-10 歲"
  
  #  NOTE「See」中文譯「見」，「See also」中文譯「參見」，請勿改動




From acli at users.sourceforge.net  Tue Jan 25 06:31:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 21:31:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.10,1.4.2.11
Message-ID: <E1CtJJ1-0003hO-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14192

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -C2 -r1.4.2.10 -r1.4.2.11
*** default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
--- default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
***************
*** 551,555 ****
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authorised_value
--- 551,555 ----
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr "%s 或同義字典：%s 或模組：%s"
  
  #. %1$s: TMPL_VAR name=authorised_value
***************
*** 814,818 ****
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authtypecode
--- 814,818 ----
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr "(定義由第 %s 號新書建議取得)"
  
  #. %1$s: TMPL_VAR name=authtypecode
***************
*** 1430,1433 ****
--- 1430,1435 ----
  "<a5> ISBD </a> <a6> Add to shelf </a> <a7> Print </a>"
  msgstr ""
+ "<a1> 修改書目 </a> <a2> 修改圖書資料 </a> <a3> 移除 </a> <a4> 一般 </a> "
+ "<a5> ISBD </a> <a6> 新增至虛擬書架 </a> <a7> 列印 </a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:4
***************
*** 1439,1449 ****
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, fuzzy, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1>查看帳戶</a> <a2>繳交罰款</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
--- 1441,1451 ----
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr "<a1> 一般 </a> <a2> MARC </a> <a3> 新增至虛擬書架 </a> <a4> 列印 </a>"
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1> 列印 </a> <a2>%s 個書目</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
***************
*** 1460,1466 ****
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, fuzzy, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> %s (%s)"
  
  # FIXME Looks like a SCANNER BUG
--- 1462,1468 ----
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> (%s 個書目)"
  
  # FIXME Looks like a SCANNER BUG
***************
*** 1482,1486 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, fuzzy, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
--- 1484,1488 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
***************
*** 1488,1493 ****
  "<a9>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
! "a> <a7>設定</a> <a8>關於</a>"
  
  #  XXX 暫譯，譯文有待改進
--- 1490,1496 ----
  "<a9>Help</a>"
  msgstr ""
! "<a1>採購</a> <a2>目錄</a> <a3>流通</a> <a4>讀者</a> "
! "<a5>權威</a> <a6>報表</a> <a7>設定</a> <a8>關於</a> "
! "<a9>說明</a>"
  
  #  XXX 暫譯，譯文有待改進
***************
*** 1497,1500 ****
--- 1500,1504 ----
  msgstr "<a1>人手建立發票</a>　　<a2>人手記入讀者貸方</a>"
  
+ #  FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:32
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:41
***************
*** 1511,1515 ****
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
--- 1515,1519 ----
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr "<a1>書籍採購資金</a> <a2>容許值</a> <a3>貨幣</a> <a4>印表機</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
***************
*** 1519,1525 ****
  "<a5>Printers</a>"
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, fuzzy, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
--- 1523,1531 ----
  "<a5>Printers</a>"
  msgstr ""
+ "<a1>書籍採購資金</a> <a2>容許值</a> <a3>同義字典</a> <a4>貨幣</a> "
+ "<a5>印表機</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
***************
*** 1527,1537 ****
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> <a5>流通</a> <a6>報表</"
! "a> <a7>設定</a> <a8>關於</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, fuzzy, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>借出</a>　<a2>移交</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
--- 1533,1544 ----
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>主頁</a> <a2>目錄</a> <a3>讀者</a> <a4>採購</a> "
! "<a5>流通</a> <a6>權威</a> <a7>報表</a> <a8>設定</a> "
! "<a9>有關</a> <a10>說明</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>借出</a>　<a2>還書</a>　<a3>移交</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
***************
*** 1556,1577 ****
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, fuzzy, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>%s</a> %s (%s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, fuzzy, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>下個讀者</a>　<a2>還書</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, fuzzy, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>下個讀者</a>　<a2>還書</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
--- 1563,1584 ----
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr "<a1>MARC</a> <a2>ISBD</a> <a3>新增至虛擬書架</a> <a4>列印</a>"
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>修改</a> %s%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>上一筆</a> <a2>下一筆</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>上一筆</a> <a2>下一筆</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
***************
*** 1589,1593 ****
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr ""
  
  #  NOTE 譯文更動 by Arthur
--- 1596,1600 ----
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr "<a1>搜尋</a> <a2>新增讀者</a> <a3>新增機構</a"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 1611,1619 ****
  msgstr "<a1>對帳表：</a>每日報告（昨天）"
  
! #  NOTE 譯文更動 by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, fuzzy, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>查看購物籃</a> <h1>%s - 訂單詳情</h1>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
--- 1618,1626 ----
  msgstr "<a1>對帳表：</a>每日報告（昨天）"
  
! #  FIXME please fix the scanner :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>查看購物籃</a> <h1 class=\"acquisition\">"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
***************
*** 1622,1641 ****
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, fuzzy, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>快速查詢</a> <a2>機讀格式查詢</a> <a3>虛擬書架</a> <a4>新增書目</a> <a5>"
! "目錄維護</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, fuzzy, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<a1>登錄</a>日期：%s"
  
  #  NOTE 譯文更動 by Arthur
--- 1629,1647 ----
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr "<a1>查詢</a> <a2>新增書目</a> <a3>期刊</a> <a4>虛擬書架</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>查詢</a> <a2>虛擬書架</a> <a3>新增書目</a> <a4>目錄維護</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<b><a1>登錄日期：</a></b>%s"
  
  #  NOTE 譯文更動 by Arthur
***************
*** 1693,1699 ****
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
  
  #. For the first occurrence,
--- 1699,1705 ----
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>館別：</b>%s <b>印表機：</b>%s <a1>修改設定</a>"
  
  #. For the first occurrence,
***************
*** 1702,1715 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>館別：</i>%s <i>印表機：</i>%s <a1>修改設定</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, fuzzy, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "已註銷：%s"
  
  #. For the first occurrence,
--- 1708,1721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>館別：</b>%s <i>印表機：</b>%s <a1>修改設定</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "<b>已註銷：</b>%s"
  
  #. For the first occurrence,
***************
*** 1759,1765 ****
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, fuzzy, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>日期：</b>%s"
  
  # XXX inconsistency?
--- 1765,1771 ----
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>應歸還日期：</b>%s"
  
  # XXX inconsistency?
***************
*** 1794,1797 ****
--- 1800,1804 ----
  "improved ldap support)"
  msgstr ""
+ "<b>EMN (Ecole des Mines de Nantes)</b>（新書建議、統計模組及改良後的 LDAP 支援）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:19
***************
*** 1803,1811 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=biblioitemnumber
--- 1810,1818 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr "<b>請輸入圖書資料之條碼：</b>圖書資料之條碼："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr "<b>Esiee 學院</b> (Jérome Vizcaino、Michel Lerenard、Pierre Cauchois)"
  
  #. %1$s: TMPL_VAR name=biblioitemnumber




From joshferraro at users.sourceforge.net  Tue Jan 25 17:53:31 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:53:31 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,NONE,1.1
Message-ID: <E1CtTwZ-0000bc-Cu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2165

Added Files:
	Amazon.pm 
Log Message:
The Amazon module allows libraries to deliver amazon content to the opac


--- NEW FILE ---

package C4::Amazon;
# Copyright 2004-2005 Joshua Ferraro (jmf at kados dot org)
#
# 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
#
# This module dynamically pulls amazon content into Koha.  It does not
# store the data in Koha's database.  You'll need to get a developer's key
# as well as an associate's tag to use it.
# FIXME: need to write up more docs.
#

use strict;
require Exporter;

use vars qw($VERSION @ISA @EXPORT);

$VERSION = 0.01;

@ISA = qw(Exporter);

@EXPORT = qw(
  &get_amazon_details
);

sub get_amazon_details {

my ( $isbn ) = @_;

# insert your dev key here
my $dev_key='';

# insert your associates tag here
my $af_tag='';

my $asin=$isbn;

# old way from command line: shift @ARGV or die "Usage:perl amazon_http.ol <asin>\n";

#my $url = "http://xml.amazon.com/onca/xml3?t=" . $af_tag .
#	"&dev-t=" . $dev_key .
#	"&type=heavy&f=xml&" .
#	"AsinSearch=" . $asin;
my $url = "http://xml.amazon.com/onca/xml3?t=$dev_key&dev-t=$af_tag&type=heavy&f=xml&AsinSearch=" . $asin;

#Here's an example asin for the book "Cryptonomicon"
#0596005423";

use XML::Simple;
use LWP::Simple;
my $content = get($url);
die "could not regrieve $url" unless $content;

my $xmlsimple = XML::Simple->new();
my $response = $xmlsimple->XMLin($content,
  forcearray => [ qw(Details Product AvgCustomerRating CustomerReview) ],
);
return $response;
#foreach my $result (@{$response->{Details}}){
#	my $product_description = $result->{ProductDescription};
#	my $image = $result->{ImageUrlMedium};
#	my $price = $result->{ListPrice};
#	my $reviews = $result->{
#	return $result;
#}
}




From joshferraro at users.sourceforge.net  Tue Jan 25 17:58:20 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:58:20 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.15
Message-ID: <E1CtU1E-0000zL-FC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3544

Modified Files:
	opac-detail.pl 
Log Message:
Adds amazon support to opac-detail.pl


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
***************
*** 10,14 ****
  use C4::Biblio;
  use C4::SearchMarc;
! 
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
--- 10,14 ----
  use C4::Biblio;
  use C4::SearchMarc;
! use C4::Amazon;
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
***************
*** 73,76 ****
  				subscriptionid => $subscriptionid,
  );
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 73,103 ----
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
! my $isbn=$dat->{'isbn'};
! my $amazon_details = &get_amazon_details($isbn);
! foreach my $result (@{$amazon_details->{Details}}){
!         $template->param(item_description => $result->{ProductDescription});
!         $template->param(image => $result->{ImageUrlMedium});
!         $template->param(list_price => $result->{ListPrice});
!         $template->param(amazon_url => $result->{url});
!                                 }
! 
! my @products;
! my @reviews;
! for my $details( @{ $amazon_details->{ Details } } ) {
!         next unless $details->{ SimilarProducts };
!         for my $product ( @{ $details->{ SimilarProducts }->{ Product } } ) {
!                 push @products, +{ Product => $product };
!         }
!         next unless $details->{ Reviews };
!         for my $product ( @{ $details->{ Reviews }->{ AvgCustomerRating } } ) {
!                 $template->param(rating => $product);
!         }
!         for my $reviews ( @{ $details->{ Reviews }->{ CustomerReview } } ) {
!                 push @reviews, +{ Summary => $reviews->{ Summary }, Comment => $reviews->{ Comment }, };
!         }
! }
! $template->param( SIMILAR_PRODUCTS => \@products );
! $template->param( REVIEWS => \@reviews );
!   ## End of Amazon Stuff
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:13:27 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:13:27 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.15,1.16
Message-ID: <E1CtUFr-0002ER-Mg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329

Modified Files:
	opac-detail.pl 
Log Message:
makes opac-detail.pl's amazon stuff just a comment


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
--- opac-detail.pl	25 Jan 2005 17:13:24 -0000	1.16
***************
*** 73,77 ****
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
--- 73,78 ----
  				subscriptionid => $subscriptionid,
  );
!   ## Amazon.com stuff
! =head
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
***************
*** 101,103 ****
--- 102,105 ----
  $template->param( REVIEWS => \@reviews );
    ## End of Amazon Stuff
+ =cut
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:23:35 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:23:35 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,1.1,1.2
Message-ID: <E1CtUPf-0002vh-TV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11210

Modified Files:
	Amazon.pm 
Log Message:
Added some minimal docs to Amazon.pm


Index: Amazon.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Amazon.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Amazon.pm	25 Jan 2005 16:53:28 -0000	1.1
--- Amazon.pm	25 Jan 2005 17:23:33 -0000	1.2
***************
*** 23,27 ****
  # FIXME: need to write up more docs.
  #
! 
  use strict;
  require Exporter;
--- 23,38 ----
  # FIXME: need to write up more docs.
  #
! # To use this module you need to do three things:
! # 1. get a dev key and associate tag from Amazon
! # 2. uncomment the Amazon stuff in opac-detail.pl
! # 3. add the template variables to opac-detail.tmpl
! #    here's what's available: 
! #    ProductDescription
! #    ImageUrlMedium
! #    ListPrice
! #    url
! #    loop SimilarProducts (Product)
! #    loop Reviews (rating, Summary)
! #
  use strict;
  require Exporter;




From oleonard at users.sourceforge.net  Tue Jan 25 22:29:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:29:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1.2.1 opac-detailprint.tmpl,NONE,1.1.2.1 opac-serial-issues.tmpl,NONE,1.1.2.1 opac-ISBDdetail.tmpl,1.1,1.1.2.1 opac-detail.tmpl,1.1,1.1.2.1 opac-search.tmpl,1.1,1.1.2.1 opac-searchresults.tmpl,1.1,1.1.2.1 opac-user.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtYFS-0001Rr-Fz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5141/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.tmpl opac-detail.tmpl opac-search.tmpl 
	opac-searchresults.tmpl opac-user.tmpl 
Added Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl opac-detailprint.tmpl 
	opac-serial-issues.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<html>
<body onLoad="window.print();self.close();">
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
	<table cellspacing="0" cellpadding="1" border="1" width=500>
	<tr valign="top">
		<td bgcolor="#cccc99" background="/images/background-mem.gif">
			<b>BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></b>
		</td>
	</tr>
	<tr valign="top">
		<td>
			<!-- TMPL_VAR NAME="author" --><br>
			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
			<!-- TMPL_VAR NAME="additional" --><br>
			<!-- TMPL_IF NAME="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
			<!-- TMPL_IF NAME="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
			</font>
		</td>
	</tr>
	</table>
<!-- /TMPL_LOOP -->

<table border="0" cellspacing="0" cellpadding="2">
	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
		<tr>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="branchname" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></td>
			<td><!-- TMPL_VAR NAME="barcode" --></td>
			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<script language="javascript" type="text/javascript">
function docprint() {
	window.print();
	window.close();
}
</script>
</body>
</html>
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<!--------------------------MAIN BODY OF PAGE-------------------------->
<div id="mainbloc">
<h1 class="catalogue">Issues for a subscription</h1>
<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
<form method="post" name="f">
<!-- TMPL_LOOP name="subscription_LOOP" -->
<div id="bloc60">
	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
		<b>
		<!--TMPL_IF name="periodicity1" -->
				day
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity2" -->
				week
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity3" -->
				2 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity4" -->
				3 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity5" -->
				month
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity6" -->
				2 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity7" -->
				3 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity8" -->
				quarter
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity9" -->
				2 quarters
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity10" -->
				year
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity11" -->
				2 years
		<!-- /TMPL_IF -->
		</b>
		on
		<b>
		<!--TMPL_IF name="arrival1" -->
			Monday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival2" -->
				Tuesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival3" -->
				Wednesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival4" -->
				Thursday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival5" -->
				Friday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival6" -->
				Saturday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival7" -->
				Sunday
		<!-- /TMPL_IF -->
		</b>
		for <b>
			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
			</b>
		since <b><!-- TMPl_VAR name="startdate" --></b>
		</p>
		<p><!-- TMPL_VAR name="notes" --></p>
	<!-- TMPL_IF name="opacnotes" -->
		<h2 class="catalogue">Issues summary</h2>
		<p>
			<!-- TMPL_VAR name="opacnote" -->
		</p>
	<!-- /TMPL_IF -->
</div>
<!-- /TMPL_LOOP -->
</div>

<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	25 Jan 2005 21:28:57 -0000	1.1.2.1
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
***************
*** 1,60 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
! </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
--- 1,90 ----
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
  	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
! </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
  		<tr>
+ 			<td>
+ 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
+ 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+ 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+ 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+ 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
+ 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
+ 					<!-- TMPL_LOOP name="subjects" -->
+ 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+ 					<br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+ 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+ 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+ 			</td>
+ 		</tr>
+ 	</table>
+ 
+ 
+ 	<!-- /TMPL_LOOP -->
+ 		<table>
+ 	<!-- TMPL_IF name="MARCNOTES" -->
+ 	<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
+ 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
***************
*** 62,118 ****
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
- 	</table>
- 
- <TMPL_UNLESS NAME="norequests">
-     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
-     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
-     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-     </form>
- </TMPL_UNLESS>
- <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
! 
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
! </div>
  </div>
! </body>
! </html>
! 
--- 92,143 ----
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
! 	<!-- /TMPL_IF -->
! 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-search.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-search.tmpl	25 Jan 2005 21:28:59 -0000	1.1.2.1
***************
*** 11,15 ****
  <div class="form">
  <table>
! <tr><th><label>Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
--- 11,15 ----
  <div class="form">
  <table>
! <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
***************
*** 17,53 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label>Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <!-- <tr><th><label class="label20">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Illustrator</label></th><td><input type="hidden" name="marclist" value="biblioitems.illus" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Dewey</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr> -->
! <tr><th><label class="label20">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label class="label20">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
--- 17,50 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="keyword" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="title">Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="subject">Subject</label></th><td>			
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" /></td></tr>
! <tr><th><label for="seriestitle">Series title</label></th><td>			
! 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="seriestitle" name="value" onchange="sql_update()" size="35"/></td></tr>
! 
! <tr><th><label for="itemtype">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
***************
*** 55,59 ****
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! 
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
--- 52,89 ----
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! <table>
! <caption>Other options:</caption>
! <tr><th><label for="barcode">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />
! 				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" /></td></tr>
! <tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="dewey" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="isbn">ISBN</label></th><td><input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="isbn" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="publisher">Publisher</label></th><td><input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="publisher" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="pubbetween">Published between</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value=">=" />
! 			<input type="text" id="pubbetween" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! <tr><th><label for="puband">...and</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="<=" />
! 			<input type="text" id="puband" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! </table>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 77,89 ****
  </form>
  
- <h3>Search by Subject</h3>
- <form action="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl" method="post">
- <div class="form">
- <table>
-  <tr><th><label for="subject">Subject</label></th><td><input type="text"  id="subject" size="25"   name="subject" /></td></tr>
- </table><input type="submit" value="Search" class="submit" />
- </div>
- </form>
- 
  <script type="text/javascript">
  function sql_update() {
--- 107,110 ----

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-searchresults.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-searchresults.tmpl	25 Jan 2005 21:29:00 -0000	1.1.2.1
***************
*** 86,95 ****
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL -->
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
! <!-- /Display for NPL -->
  </div> 
  
--- 86,95 ----
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL 
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
!  /Display for NPL -->
  </div> 
  
***************
*** 98,105 ****
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL -->	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div><!-- /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>
--- 98,105 ----
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL 	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div> /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
--- opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
***************
*** 128,132 ****
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 128,132 ----
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Tue Jan 25 22:39:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:39:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.3.2.1
Message-ID: <E1CtYP8-00024f-NN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7863/opac

Modified Files:
      Tag: rel_2_2
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:39:13 -0000	1.3.2.1
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:40:41 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.4
Message-ID: <E1CtYQT-0002An-G3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8316/opac

Modified Files:
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:40:38 -0000	1.4
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:52:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:52:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.1.2.1
Message-ID: <E1CtYc8-0002x7-Hv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11296/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:52:29 -0000	1.1.2.1
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 22:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.2
Message-ID: <E1CtYd4-00030J-No@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11505/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:53:33 -0000	1.2
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 23:42:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:42:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZOk-00063A-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23226/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-addbookbybiblionumber.tmpl	25 Jan 2005 21:29:02 -0000	1.1.2.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:42:53 -0000	1.1.2.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Tue Jan 25 23:45:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:45:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZQt-0006Am-0Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23647/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
--- opac-detail.tmpl	25 Jan 2005 22:45:05 -0000	1.1.2.2
***************
*** 1,143 ****
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
! 	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
! 		<tr>
! 			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
! 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
! 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
! 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
! 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
! 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
! 			</td>
! 		</tr>
! 	</table>
  
  
! 	<!-- /TMPL_LOOP -->
! 		<table>
! 	<!-- TMPL_IF name="MARCNOTES" -->
! 	<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
! 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
  	<!-- /TMPL_IF -->
- 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 1,109 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
+  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
+ <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
! 		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
+ </table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
  	<!-- /TMPL_IF -->
  </div>
! </div>
! </body>
! </html>
! 




From oleonard at users.sourceforge.net  Tue Jan 25 23:47:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:47:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.2,1.3
Message-ID: <E1CtZT3-0006JE-GR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24220/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Synching with default template, other cosmetic changes

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
--- opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
***************
*** 29,72 ****
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	</table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
--- 29,59 ----
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
! 
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! </table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
***************
*** 102,106 ****
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>
--- 89,93 ----
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>




From oleonard at users.sourceforge.net  Tue Jan 25 23:48:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:48:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.1.2.1
Message-ID: <E1CtZUT-0006NL-9R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24421/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;
***************
*** 518,521 ****
--- 527,542 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Tue Jan 25 23:49:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:49:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1.2.1,1.1.2.2
Message-ID: <E1CtZUx-0006Of-WD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding Dopop function for virtual shelves popup

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
--- script.js	25 Jan 2005 22:49:09 -0000	1.1.2.2
***************
*** 60,62 ****
  		return false;
  	}
! }
\ No newline at end of file
--- 60,66 ----
  		return false;
  	}
! }
! 
! function Dopop(link) {
! 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
! 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:53:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:53:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.2
Message-ID: <E1CtZZG-0006fN-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25604/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	script.js 
Log Message:
Three new functions: CheckAll, which toggles checkboxes in results lists; confirmDelete, which offers a warning before proceding with an action; Dopop, for popping up virtual shelves window

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	25 Jan 2005 22:53:46 -0000	1.2
***************
*** 39,40 ****
--- 39,66 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
+ 
+ function Dopop(link) {
+ 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:55:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:55:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.2,1.3
Message-ID: <E1CtZaX-0006lB-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25811/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac.css	24 Jan 2005 22:54:02 -0000	1.2
--- opac.css	25 Jan 2005 22:54:57 -0000	1.3
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;




From oleonard at users.sourceforge.net  Tue Jan 25 23:56:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:56:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CtZbx-0006qL-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-addbookbybiblionumber.tmpl	24 Jan 2005 22:51:52 -0000	1.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:56:27 -0000	1.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Wed Jan 26 17:39:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 26 Jan 2005 08:39:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17,1.17.2.1
Message-ID: <E1CtqCT-0003no-Me@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14532/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Minor corrections to syntax there and there.  Shouldn't affect display.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -r1.17 -r1.17.2.1
*** opac.css	3 Jan 2005 11:08:36 -0000	1.17
--- opac.css	26 Jan 2005 16:39:23 -0000	1.17.2.1
***************
*** 1,5 ****
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica;
  	font-size:12pt;
  	margin:0px;
--- 1,5 ----
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica,sans-serif;
  	font-size:12pt;
  	margin:0px;
***************
*** 276,281 ****
  #leftbloc {
  	float:left;
! 	width=30%;
! 	border:1;
  }
  
--- 276,281 ----
  #leftbloc {
  	float:left;
! 	width:30%;
! 	border:0;
  }
  
***************
*** 293,297 ****
  	float:left;
  	width:30%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 293,296 ----
***************
*** 301,305 ****
  	float:left;
  	width:60%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 300,303 ----
***************
*** 391,395 ****
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;
--- 389,393 ----
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:#FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;




From acli at users.sourceforge.net  Thu Jan 27 08:11:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 26 Jan 2005 23:11:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.11,1.4.2.12
Message-ID: <E1Cu3ob-0005vh-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22754

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -C2 -r1.4.2.11 -r1.4.2.12
*** default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
--- default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
***************
*** 59,64 ****
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:9
  msgid ""
--- 59,65 ----
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr "讀者類別「A」（成人）及「W」可以作為其他讀者的「擔保人」，如果該等讀者為他們的受養人。"
[...1075 lines suppressed...]
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "對應的分欄必須設定容許值為branches"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
- #, fuzzy
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "對應的分欄必須設定容許值為itemtype"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45
--- 20871,20880 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:81
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:95
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "對應的分欄必須設定容許值為「branches」"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "對應的分欄必須設定容許值為「itemtype」"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45




From oleonard at users.sourceforge.net  Thu Jan 27 18:18:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:18:31 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.2,1.3.2.3
Message-ID: <E1CuDHr-0008A6-Qw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
--- opac-shelves.pl	27 Jan 2005 17:18:28 -0000	1.3.2.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
! my $headerbackgroundcolor='#663266';
! my $circbackgroundcolor='#555555';
! my $circbackgroundcolor='#550000';
! my $linecolor1='#bbbbbb';
! my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,38 ----
  my $env;
  my $query = new CGI;
! 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
***************
*** 63,68 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
--- 59,63 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 				});
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.3.2.3  2005/01/27 17:18:28  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:27:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:27:15 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.4,1.5
Message-ID: <E1CuDQJ-0000At-DI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv648/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
--- opac-shelves.pl	27 Jan 2005 17:27:11 -0000	1.5
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
- my $headerbackgroundcolor='#663266';
- my $circbackgroundcolor='#555555';
- my $circbackgroundcolor='#550000';
- my $linecolor1='#bbbbbb';
- my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,37 ----
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.5  2005/01/27 17:27:11  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.4  2005/01/13 20:41:07  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:30:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:30:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.2.2.1
Message-ID: <E1CuDSz-0000L0-MS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1260/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:29:58 -0000	1.2.2.1
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 18:31:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:31:15 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.3
Message-ID: <E1CuDUB-0000Qa-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1633/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:31:13 -0000	1.3
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 19:10:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:10:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1.2.1,1.1.2.2
Message-ID: <E1CuE6I-0003Au-5W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12182/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
--- opac.css	27 Jan 2005 18:10:34 -0000	1.1.2.2
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:11:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:11:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.3,1.4
Message-ID: <E1CuE7G-0003Eu-I6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12411/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac.css	25 Jan 2005 22:54:57 -0000	1.3
--- opac.css	27 Jan 2005 18:11:36 -0000	1.4
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:18:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:18:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CuEDm-0003cb-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13906/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Adding icons to submit buttons

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
--- opac-shelves.tmpl	27 Jan 2005 18:18:19 -0000	1.1.2.2
***************
*** 5,9 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
--- 5,9 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
***************
*** 23,30 ****
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
--- 23,30 ----
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">




From oleonard at users.sourceforge.net  Thu Jan 27 19:21:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:21:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.2.2.1
Message-ID: <E1CuEGv-0003oO-A9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14633/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:21:28 -0000	1.2.2.1
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 19:23:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:23:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.3
Message-ID: <E1CuEIz-0003vB-Ug@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15056/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:23:43 -0000	1.3
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 20:31:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:31:16 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.7
Message-ID: <E1CuFMK-0008Ks-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32023

Modified Files:
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:31:14 -0000	1.7
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }




From oleonard at users.sourceforge.net  Thu Jan 27 20:35:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.7,1.8
Message-ID: <E1CuFQn-0000Ck-C7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv762/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
--- circulation.tmpl	27 Jan 2005 19:35:50 -0000	1.8
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 20:38:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:38:30 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.6.2.1
Message-ID: <E1CuFTK-0000Ow-UK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1485

Modified Files:
      Tag: rel_2_2
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:38:27 -0000	1.6.2.1
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jan 27 20:41:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:41:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.1,1.6.2.2
Message-ID: <E1CuFW8-0000dW-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2421/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
--- circulation.tmpl	27 Jan 2005 19:41:21 -0000	1.6.2.2
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 19:19:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:19:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-main.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1CuEEP-0003fS-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14052/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Taking out unused class name

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
--- opac-main.tmpl	27 Jan 2005 18:18:57 -0000	1.3.2.2
***************
*** 63,67 ****
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="opac-suggestions.pl" class="button">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>
--- 63,67 ----
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>




From oleonard at users.sourceforge.net  Thu Jan 27 23:24:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:24:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.33
Message-ID: <E1CuI3a-0002Z3-0L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9812/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:24:03 -0000	1.33
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,159 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
--- 164,168 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>




From oleonard at users.sourceforge.net  Thu Jan 27 23:25:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:25:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.32.2.1
Message-ID: <E1CuI54-0002er-Dw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10190/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
      Tag: rel_2_2
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:25:36 -0000	1.32.2.1
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,163 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->
--- 164,172 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div class="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->




From oleonard at users.sourceforge.net  Thu Jan 27 23:32:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:32:22 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.5.2.1
Message-ID: <E1CuIBa-00034P-HD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11780/members

Modified Files:
      Tag: rel_2_2
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:32:18 -0000	1.5.2.1
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Thu Jan 27 23:33:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:33:18 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.6
Message-ID: <E1CuICU-00037P-Eo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11975/members

Modified Files:
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:33:16 -0000	1.6
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Fri Jan 28 20:34:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 11:34:17 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.14.2.1
Message-ID: <E1Cubsn-00019E-V6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4384/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.  Copying this fix from HEAD to rel_2_2. Helps fix Bug 670

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	28 Jan 2005 19:34:15 -0000	1.14.2.1
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Fri Jan 28 21:13:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 12:13:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1CucVB-0003eg-Pf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14030/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.  Copied from HEAD.  Helps fix Bug 670

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
--- opac-user.tmpl	28 Jan 2005 20:13:54 -0000	1.1.2.3
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,89 ****
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
+ <!-- <th>Status</th> -->
  </tr>
  
***************
*** 91,99 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,111 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
+ <!-- <td>
+ <!-- TMPL_IF NAME="status" -->
+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
+ <!-- TMPL_ELSE -->
+ Not renewable
+ <!-- /TMPL_IF -->
+ </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 113,132 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 125,148 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From acli at users.sourceforge.net  Sun Jan 30 07:43:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 22:43:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Cv8ni-0007xA-6X@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30535

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Removed 1 fuzzy


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
--- css_opac_zh_TW.po	30 Jan 2005 06:43:11 -0000	1.4.2.5
***************
*** 18,27 ****
  "Content-Transfer-Encoding: 8bit\n"
  
- # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid " Biblio(s) added"
! msgstr "成功新增書目"
  
  #. %1$S: type=text name=value
--- 18,25 ----
  "Content-Transfer-Encoding: 8bit\n"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid " Biblio(s) added"
! msgstr "個書目成功新增"
  
  #. %1$S: type=text name=value




From acli at users.sourceforge.net  Sun Jan 30 08:07:10 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 23:07:10 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.12,1.4.2.13
Message-ID: <E1Cv9As-0000Wt-D0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1887

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor, partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -C2 -r1.4.2.12 -r1.4.2.13
*** default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
--- default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
***************
*** 2451,2455 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
--- 2451,2455 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr "接納"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
***************
*** 2461,2465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
--- 2461,2465 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr "接納者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
***************
*** 2474,2484 ****
  msgstr "<a1>%s %s</a> 之賬戶"
  
! #  NOTE Stephen Hedges 答：「Accounts」係指財務報表 (Till Reconciliation)
! #  NOTE 所以整個字串只需譯「報表」即可
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
- #, fuzzy
  msgid "Accounting details"
! msgstr "報表"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
--- 2474,2482 ----
  msgstr "<a1>%s %s</a> 之賬戶"
  
! #  NOTE 譯文更動 by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
  msgid "Accounting details"
! msgstr "會計詳情"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
***************
*** 2667,2673 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
- #, fuzzy
  msgid "Add a book by barcode"
! msgstr "在 %s 以條碼新增："
  
  #. %1$s: TMPL_VAR name=shelfname
--- 2665,2670 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
  msgid "Add a book by barcode"
! msgstr "以條碼新增圖書資料"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 3316,3322 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
- #, fuzzy
  msgid "Auth"
! msgstr "著者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
--- 3313,3318 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
  msgid "Auth"
! msgstr "權威"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
***************
*** 3443,3452 ****
  msgstr ""
  
! #  XXX 暫譯，要問人核對
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, fuzzy, c-format
  msgid "Authority number %s"
! msgstr "權威說明"
  
  #. For the first occurrence,
--- 3439,3448 ----
  msgstr ""
  
! # XXX
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, c-format
  msgid "Authority number %s"
! msgstr "權威號碼：%s"
  
  #. For the first occurrence,
***************
*** 3454,3488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, fuzzy, c-format
  msgid "Authority number : %s"
! msgstr "借書證號碼：%s"
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
- # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
- #, fuzzy
  msgid "Authority search"
! msgstr "權威"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
--- 3450,3486 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, c-format
  msgid "Authority number : %s"
! msgstr "權威號碼：%s"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr "權威號碼：<!-- TMPL_VAR name=\"authid\" -->"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
  msgid "Authority search"
! msgstr "權威搜尋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
***************
*** 3490,3503 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
- #, fuzzy
  msgid "Authority search results"
! msgstr "機讀格式查詢結果"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, fuzzy, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s 之機讀格式分欄結構管理"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
--- 3488,3500 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
  msgid "Authority search results"
! msgstr "權威搜尋結果"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s (%s) 之權威結構定義"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
***************
*** 4150,4173 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
- #, fuzzy
  msgid "Barcode Search"
! msgstr "館藏查詢"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
- #, fuzzy
  msgid "Barcode:"
! msgstr "條碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
--- 4147,4168 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
  msgid "Barcode Search"
! msgstr "條碼搜尋"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
  msgid "Barcode:"
! msgstr "條碼："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr "條碼產生器"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
***************
*** 4581,4587 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
- #, fuzzy
  msgid "Book seller"
! msgstr "虛擬書架"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
--- 4576,4581 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
  msgid "Book seller"
! msgstr "圖書供應商"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
***************
*** 5240,5246 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
- #, fuzzy
  msgid "Category Code and Description"
! msgstr "類別管理"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
--- 5234,5239 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
  msgid "Category Code and Description"
! msgstr "類別代碼及描述"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
***************
*** 5615,5619 ****
  #. INPUT type=reset name=B2
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:174
- #, fuzzy
  msgid "Clear Fields"
  msgstr "全部重設"
--- 5608,5611 ----
***************
*** 10025,10034 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
- #, fuzzy
  msgid "Items requested"
! msgstr "已預約"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
--- 10017,10025 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr "借出的資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
  msgid "Items requested"
! msgstr "預約的資料"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
***************
*** 10065,10069 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "忽略"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
--- 10056,10060 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "象牙"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
***************
*** 17081,17085 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6
--- 17072,17076 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr "建議者"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6




From acli at users.sourceforge.net  Mon Jan 31 02:52:39 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.2
Message-ID: <E1CvQk3-0006Zs-Ix@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25267

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:36 -0000	1.2
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:53:09 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:53:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CvQkX-0006ba-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25376

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:53:07 -0000	1.1.2.2
***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:52:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.1.2.1
Message-ID: <E1CvQkI-0006aV-Tz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25309

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 03:44:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 18:44:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.13,1.4.2.14
Message-ID: <E1CvRXm-0000n9-5z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2974

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -C2 -r1.4.2.13 -r1.4.2.14
*** default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
--- default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
***************
*** 227,230 ****
--- 227,231 ----
  msgstr "%S 年"
  
+ # XXX
  #. %1$p: type=radio name=label value=<!-- TMPL_VAR NAME="tagname" -->
  #. %2$s: TMPL_VAR name=labelname
***************
*** 232,236 ****
  #, c-format
  msgid "%p Label %s"
[...964 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
--- 18480,18484 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:25
  msgid "Tri-dimensionnel"
! msgstr "立體"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
***************
*** 20556,20560 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21
--- 20563,20567 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr "照像（例如以傳統可見光譜航空照像技術所製作之地圖）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21




From acli at users.sourceforge.net  Mon Jan 31 07:02:50 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 22:02:50 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.14,1.4.2.15
Message-ID: <E1CvUeA-0001u4-91@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7245

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.14
retrieving revision 1.4.2.15
diff -C2 -r1.4.2.14 -r1.4.2.15
*** default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
--- default_intranet_zh_TW.po	31 Jan 2005 06:02:44 -0000	1.4.2.15
***************
*** 610,614 ****
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s 個建議待理 <a1>管理</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
--- 610,614 ----
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s 個建議有待處理　<a1>處理</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
***************
*** 9810,9816 ****
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, fuzzy, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "在分館 <b>%s</b> 等候由 %s (<a1>%s</a>) 取書。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
--- 9810,9816 ----
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "圖書資料「%1$s」(%2$s) 現為「等候」狀態，正等候由 %4$s (<a1>%5$s</a>) 在 <b>%3$s</b> 取書。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
***************
*** 9925,9929 ****
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
--- 9925,9929 ----
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr "圖書資料類別：請在此處選擇圖書資料類別。如不選擇，將搜尋所有圖書資料類別。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
***************
*** 9939,9943 ****
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
--- 9939,9943 ----
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr "圖書資料類別有多種用途，而且對 Koha 的運作有<b>莫大</b>的影響："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
***************
*** 10338,10342 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "登入Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
--- 10338,10342 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "登入 Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
***************
*** 10394,10398 ****
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
--- 10394,10398 ----
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr "Koha 內部使用（你毋須修對以下的預設值作出任何修改）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
***************
*** 10410,10414 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
--- 10410,10414 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr "Koha 連結："
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
***************
*** 10456,10468 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
--- 10456,10469 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr "標籤高度（公厘 / 毫米）"
  
+ # XXX
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr "起首列印之標籤號碼"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr "標籤闊度（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
***************
*** 10682,10686 ****
  #, c-format
  msgid "Link:%s,"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
--- 10683,10687 ----
  #, c-format
  msgid "Link:%s,"
! msgstr "連結：%s、"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
***************
*** 10924,10927 ****
--- 10925,10929 ----
  "results screens."
  msgstr ""
+ "未被連結至 Koha 資料庫的機讀格式資料並不會消失&mdash;&mdash;它只是不會在流通畫面顯示，也不會在某些查詢館藏的結果列出。"
  
  #. %1$s: TMPL_VAR name=tagfield
***************
*** 11060,11068 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
- #, fuzzy
  msgid "Managed in tab"
! msgstr "在第「-1」格 (即不顯示)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
--- 11062,11071 ----
  msgstr ""
  
+ # FIXME bug in tokenizer
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
  msgid "Managed in tab"
! msgstr "在第幾格顯示："
  
+ # FIXME grammatical mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
***************
*** 11202,11210 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
--- 11205,11213 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr "頁面下面邊界（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr "頁面左面邊界（公厘 / 毫米）"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
***************
*** 12390,12394 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
--- 12393,12397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr "沒有未處理的新書建議"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
***************
*** 15677,15683 ****
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, fuzzy, c-format
  msgid "Reserved by %s"
! msgstr "收貨人：%s"
  
  # XXX
--- 15680,15686 ----
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, c-format
  msgid "Reserved by %s"
! msgstr "圖書資料已被 %s 預約"
  
  # XXX
***************
*** 15685,15691 ****
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, fuzzy, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "%s 已預約 (<a1>%s</a>)。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
--- 15688,15694 ----
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "已預約：圖書資料已被 %s (<a1>%s</a>) 預約 。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
***************
*** 15914,15920 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
- #, fuzzy
  msgid "Sample"
! msgstr "姓"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
--- 15917,15922 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
  msgid "Sample"
! msgstr "樣本"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
***************
*** 16005,16013 ****
  msgstr "儲存"
  
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
- #, fuzzy
  msgid "Save Code"
! msgstr "條碼"
  
  #. INPUT type=submit
--- 16007,16015 ----
  msgstr "儲存"
  
+ #  NOTE「Code」此處係指「Country Code」
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
  msgid "Save Code"
! msgstr "儲存號碼"
  
  #. INPUT type=submit
***************
*** 16484,16496 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
--- 16486,16499 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr "設定頁面類型。"
  
+ # FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr "設定你使用的標籤的闊度及高度。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr "設定預設的 DPI 值。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
***************
*** 16498,16502 ****
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67
--- 16501,16505 ----
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr "設定圖書資料類別，乃安裝 Koha 後其中一個必須儘快辦妥的步驟。"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67




From shedges at users.sourceforge.net  Sun Jan  2 15:12:42 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Sun, 02 Jan 2005 06:12:42 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,NONE,1.1
Message-ID: <E1Cl6TK-0003qX-KF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14771

Added Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Load original version

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Installing Koha 2.2 on Fedora Core (1, 2, 3)</title>

  <articleinfo>
    <pubdate>2005-01-03</pubdate>

    <author>
      <firstname>Joshua</firstname>

      <surname>Ferraro</surname>
    </author>

    <revhistory>
      <revision>
        <revnumber>2.2.0</revnumber>

        <date>2004-12-23</date>

        <revdescription>
          <para>Changes made by Joshua Ferraro. Original Document</para>
        </revdescription>
      </revision>
    </revhistory>
  </articleinfo>

  <section>
    <title>Using this document</title>

    <section>
      <title id="copyright">Copyright and License</title>

      <para>Copyright 2004, 2005 Joshua Ferraro <email>jmf (at)
      kados.org</email></para>

      <para>This document is related to Koha and is licensed to you under the
      GNU General Public License version 2 or later (<ulink
      url="http://www.gnu.org/licenses/gpl.html">http://www.gnu.org/licenses/gpl.html</ulink>).
      Koha-related documents may be reproduced and distributed in whole or in
      part, in any medium physical or electronic, as long as this copyright
      notice is retained on all copies.</para>

      <para>You may create a derivative work and distribute it provided that
      you: <orderedlist>
          <listitem>
            <para>License the derivative work with this same license, or the
            Linux Documentation Project License (<ulink
            url="http://www.tldp.org/COPYRIGHT.html">http://www.tldp.org/COPYRIGHT.html</ulink>).
            Include a copyright notice and at least a pointer to the license
            used.</para>
          </listitem>

          <listitem>
            <para>Give due credit to previous authors and major
            contributors.</para>
          </listitem>
        </orderedlist></para>

      <para>Commercial redistribution is allowed and encouraged; however, the
      author would like to be notified of any such distributions.</para>
    </section>

    <section>
      <title id="disclaimer">Disclaimer</title>

      <para>No liability for the contents of this document can be accepted.
      Use the concepts, examples and information at your own risk. There may
      be errors and inaccuracies, that could be damaging to your system.
      Proceed with caution, and although this is highly unlikely, the
      author(s) do not take any responsibility.</para>

      <para>All copyrights are held by their by their respective owners,
      unless specifically noted otherwise. Use of a term in this document
      should not be regarded as affecting the validity of any trademark or
      service mark. Naming of particular products or brands should not be seen
      as endorsements.</para>
    </section>
  </section>

  <section>
    <title>Introduction</title>

    <section>
      <title>Prior Knowledge and Assumptions</title>

      <para>In this document I assume that you are running a standard
      installation of <application>Fedora Core</application> (1, 2, or 3). If
      you need help setting up <application>Fedora Core</application> on your
      machine please see the Fedora installation manual available from <ulink
      url="http://fedora.redhat.com">http://fedora.redhat.com</ulink>. I would
      highly recommend using the latest release of <application>Fedora
      Core</application> as the shelf-life of these distributions is only
      about 12 months. If you need a longer shelf life for your
      <application>Koha</application> machines I recommend either
      <application>Red Hat Enterprise Linux</application> (AS or ES) or a
      distro like <application>Debian</application> which does not charge for
      a subscription service and has a much longer shelf life. If, like me,
      you expect that you will be upgrading your
      <application>Koha</application> installation every 6 months or so the
      <application>Fedora Core</application> series are a good choice.</para>

      <para>For more information about <application>Fedora Core</application>
      see the release notes for the distro you have chosen:</para>

      <variablelist>
        <varlistentry>
          <term>Core 1:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/1/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 2:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/2/i386/os/RELEASE-NOTES-en.html</ulink></para>
          </listitem>
        </varlistentry>

        <varlistentry>
          <term>Core 3:</term>

          <listitem>
            <para><ulink
            url="http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.html">http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/RELEASE-NOTES-en.htm</ulink>l</para>
          </listitem>
        </varlistentry>
      </variablelist>

      <para>If you already have some knowledge about
      <application>Linux</application> or other Unices it will be easier to
      understand this manual, however, no intermediate steps are necessary
      subsequent to the installation of <application>Fedora Core</application>
      before beginning the <application>Koha</application> installation. This
      guide is a "cookbook" for installing dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>.</para>
    </section>

    <section>
      <title>Internet Connection</title>

      <para>This guide assumes that the <application>Koha</application> server
      has a dedicated Internet connection -- a high-speed connection is best.
      It is possible to install <application>Koha</application> without a
      dedicated Internet connection, but this guide does not go into how to do
      that.</para>
    </section>

    <section>
      <title>Package Group Selections</title>

      <para>During a CD installation of <application>Fedora Core</application>
      you have the option of selecting "Package Groups" for installation --
      you can also access this utility after installation.<tip>
          <para>It can be found from the "hat" menu under <userinput>System
          Settings --&gt; Add/Remove Applications</userinput></para>
        </tip></para>

      <para>You'll want to install the following package groups:</para>

      <itemizedlist>
        <listitem>
          <para>Web Server</para>
        </listitem>

        <listitem>
          <para>MySQL Database<note>
              <para>Careful, Core 1 and 2 hide this option ... use the
              <userinput>Details</userinput> button to select
              <application>MySQL</application> and de-select
              <application>PostgreSQL</application></para>
            </note></para>
        </listitem>

        <listitem>
          <para>Development Tools</para>
        </listitem>

        <listitem>
          <para>Administration Tools (optional but a good idea)</para>
        </listitem>

        <listitem>
          <para>System Tools (optional but a good idea)</para>
        </listitem>
      </itemizedlist>

      <para>I don't generally recommend installing "Everything". Mainly this
      is because the more applications you have installed and running on your
      system the more complex the maintenance becomes. Running unused
      applications may also open up your system to attacks that would
      otherwise not be an issue.</para>
    </section>

    <section>
      <title>Firewall Configuration</title>

      <para>I would highly recommend utilizing the default firewall features
      that come with <application>Fedora Core</application>. However, you'll
      want to allow access to <command>http/https</command> (port 80 and 8080)
      as well as <command>ssh</command> (port 22). You can configure the
      firewall during the initial install or subsequently using the "Security
      Level" utility in the "hat" menu.</para>
    </section>

    <section>
      <title>A Note On The Graphical User Interface (GUI)</title>

      <para><application>Fedora Core</application> will always default to
      installing and loading your GUI (by default this is
      <application>X.org</application> and <application>Gnome</application>).
      In the past I have always disabled installation of the GUI on a
      production server, but lately I've taken to installing it and then
      tweaking the startup procedures so that the GUI does not load by default
      but must be started manually (so during normal operations the GUI does
      not waste precious resources). This is mainly because I find some of the
      GUI tools to be quite useful when I'm physically on-location and working
      on a server. To disable the GUI subsequent to installation simply edit
      <filename>/etc/inittab</filename> and make the default runlevel 3
      instead of 5. To start the GUI afterwards type
      <userinput>startx</userinput> at the command prompt.</para>

      <para>If the machine on which you will install
      <application>Koha</application> is nearby you can log in locally to
      perform the <application>Koha</application> install. But most folks find
      it more convenient to log in remotely using an <command>SSH</command> or
      a <command>Telnet</command> client. If you are running
      <application>Windows</application> you can start
      <command>Telnet</command> by clicking
      <userinput>Start-&gt;Run</userinput> from the start menu and typing
      <userinput>telnet</userinput>. Or you can download the free
      <command>SSH</command> program <command>PuTTy</command> from <ulink
      url="http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html">http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html</ulink>.
      <command>SSH</command> is a more secure and robust terminal emulator
      standard and is a better choice.</para>

      <para>For many of the commands it will be necessary to have superuser
      privileges on the <application>Koha</application> server. However, it's
      generally not a good idea to log into your server directly as the root
      user. It's better to use the <command>su</command> utility to allow your
      regular user to obtain superuser privileges. For example,<literallayout>jmf at koha:~$ su
password:
koha:/home/jmf#</literallayout>The <prompt>#</prompt> tells you that you have
      root privileges. If you want to return to your regular user type
      <userinput>exit</userinput>.</para>
    </section>

    <section>
      <title>Update Your System</title>

      <para><application>Fedora Core</application> has a rapid development
      pace. There are usually daily updates or bugfixes to applications in the
      system. Be sure your installation is up-to-date. You can install updates
      either using the <command>up2date</command> application (or it's GUI
      equivalent) or by using the new tool <command>yum</command>. To install
      updates using <command>yum</command> type:<literallayout>[root at koha]# yum update</literallayout></para>

      <para>You can also use <command>yum</command> to install programs that
      have been packaged for <application>Fedora Core</application>. See the
      <command>yum</command> <command>man</command> page for more
      information.</para>
    </section>
  </section>

  <section>
    <title>Dependencies</title>

    <para><application>Koha</application> is built with a number of related
    open source web-based technologies which are sometimes designated with the
    acronym L.A.M.P. L.A.M.P. refers to <application>Linux</application> (the
    GNU/Linux operating system), <application>Apache</application> (a robust
    web server application), <application>MySQL</application> (a Relational
    Database Management System using the SQL standard) and Perl/Python/PHP
    (three common scripting languages). <application>Koha</application> was
    originally designed for a GNU/Linux system running
    <application>Apache</application> and <application>MySQL</application> and
    is written almost entirely in <application>Perl</application>. In order to
    install and use <application>Koha</application> it is necessary first to
    install and configure these dependencies.</para>

    <section>
      <title>Perl</title>

      <para>The majority of <application>Koha</application> is written in
      <application>Perl</application> -- a high-level programming or scripting
      language. <application>Perl</application>'s functionality and usefulness
      has been extended and enhanced through the development and free
      distribution of modules (programming libraries) within the
      <application>Perl</application> community. The vast majority of these
      modules are available through the Perl Network
      <emphasis>CPAN</emphasis>. Others are available for download from the
      module developer's website or <command>ftp</command> server. Some of
      these modules have also been packaged directly into <application>Fedora
      Core</application>'s packaging system.</para>

      <para><application>Koha</application> relies on several of these
      extended module libraries for its functions and getting all of these
      modules set up can be the most challenging part of the
      <application>Koha</application> installation.
      <application>Perl</application> itself is installed by default on a
      <application>Fedora Core</application> system so you needn't install it.
      The extended <application>Perl</application> modules that are not
      available via <application>Fedora Core</application>'s packaging system
      are available on the Perl Network <command>CPAN</command>.
      <application>Perl</application> has a utility that can be run to
      automatically install modules from <command>CPAN</command> and it's
      pretty good about keeping track of dependencies within
      <application>Perl</application> itself, but it cannot handle
      dependencies outside the <application>Perl</application> base. So before
      we can install these modules we need to install their dependencies which
      are outside of <application>Perl</application>.</para>

      <section>
        <title>Configuring Perl's CPAN utility while installing
        MARC::Record</title>

        <para>The first time you use <application>Perl</application>'s
        <command>CPAN</command> utility it will configure itself. So we can
        start that process by telling <application>Perl</application> to
        install the <filename>MARC::Record</filename> module from the
        <command>CPAN</command> network:<literallayout>koha:/# perl -MCPAN -e 'install "MARC::Record"'</literallayout>You
        should get the following message:<literallayout>/usr/share/perl/5.6.1/CPAN/Config.pm initialized.

CPAN is the world-wide archive of perl resources. It 
consists of about 100 sites that all replicate the same
contents all around the globe.  Many countries have at
least one CPAN site already. The resources found on CPAN
are easily accessible with the CPAN.pm module. If you want
to use CPAN.pm, you have to configure it properly.

If you do not want to enter a dialog now, you can answer
'no' to this question and I'll try to autoconfigure. (Note:
you can revisit this dialog anytime later by typing 'o conf
init' at the cpan prompt.)

Are you ready for manual configuration? [yes]</literallayout></para>

        <para>The setup process will take a while. It should be safe to answer
        all the questions with the default answers. You can safely ignore the
        utilities' attempts to get you to upgrade or install other
        <application>Perl</application> modules but you should allow it to
        prepend prerequisites. You can also set it to automatically build
        <application>Perl</application> prerequisites without asking by typing
        <userinput>follow</userinput> at the following prompt:<literallayout>The CPAN module can detect when a module that which you are
trying to build depends on prerequisites. If this happens,
it can build the prerequisites for you automatically
('follow'), ask you for confirmation ('ask'), or just
ignore them ('ignore'). Please set your policy to one of
the three values.

Policy on building prerequisites (follow, ask or ignore)? 
[ask]</literallayout>Eventually you may get the following
        message:<literallayout>Now we need to know where your favorite CPAN sites are located. Push
a few sites onto the array (just in case the first on the array won't
work). If you are mirroring CPAN to your local workstation, specify a
file: URL.

First, pick a nearby continent and country (you can pick several of
each, separated by spaces, or none if you just want to keep your
existing selections). Then, you will be presented with a list of URLs
of CPAN mirrors in the countries you selected, along with previously
selected URLs. Select some of those URLs, or just keep the old list.
Finally, you will be prompted for any extra URLs -- file:, ftp:, or
http: -- that host a CPAN mirror.

(1) Africa
(2) Asia
(3) Central America
(4) Europe
(5) North America
(6) Oceania
(7) South America
Select your continent (or several nearby continents) []</literallayout>Proceed
        by selecting the numeric value for your location. You may be prompted
        for a more specific location and finally you will be able to select
        several URLs for <command>CPAN</command> to use to download your
        modules from. It's a good idea to select a few just in case some of
        them are not operational or are slow.</para>
      </section>

      <section>
        <title>The Yaz Toolkit</title>

        <para>As long as everything went smoothly with the
        <command>CPAN</command> installation, <application>Perl</application>
        should finish the install and return you to the command prompt. We're
        almost ready to install the remaining <application>Perl</application>
        modules but one of them, namely <filename>Net::Z3950</filename>, has a
        non-Perl dependency that we need to install first called
        <application>Yaz</application>.</para>

        <para>As of this writing Indexdata, who wrote and maintains the
        <application>Yaz</application> toolkit has made packages available for
        <application>Fedora Core</application> 2 and 3. These can be
        downloaded from their <command>ftp</command> site: <ulink
        url="http://ftp.indexdata.dk/pub/yaz/redhat/">http://ftp.indexdata.dk/pub/yaz/redhat/</ulink>.
        You'll need the <filename>yaz</filename>, <filename>libyaz</filename>
        and <filename>libyaz-devel</filename> packages (the latest version
        should be fine and if you don't find a package for your specific
        version of <application>Fedora Core</application> a previous version
        should work). Navigate to a convenient spot and type:<literallayout>[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/yaz-2.0.28-1.i386.rpm
[root at koha]# wget http://ftp.indexdata.dk/pub/yaz/redhat/fc2/libyaz-devel-2.0.28-1.i386.rpm</literallayout></para>

        <para>Now you should have three rpms that can be installed with the
        <command>rpm</command> utility thusly:<literallayout>[root at koha]# rpm -i yaz*
[root at koha]# rpm -i libyaz*</literallayout>(the * is a wildcard).</para>
      </section>

      <section>
        <title>Installing the Remaining Perl Modules</title>

        <para>At this point we can install the other
        <application>Perl</application> modules:<literallayout>[root at koha]# perl -MCPAN -e 'install Event'
[root at koha]# perl -MCPAN -e 'install Net::Z3950'
[root at koha]# perl -MCPAN -e 'install Digest::MD5'
[root at koha]# perl -MCPAN -e 'install "HTML::Template"'
[root at koha]# perl -MCPAN -e 'install "Mail::Sendmail"'
[root at koha]# perl -MCPAN -e 'install "PDF::API2"'</literallayout></para>

        <para>That should take care of the <application>Perl</application>
        installation and configuration as well as all the modules. If we left
        any <application>Perl</application> modules out
        <application>Koha</application> will warn us when we run the install
        script and will give instructions on how to install them.</para>
      </section>
    </section>

    <section>
      <title>MySQL</title>

      <para>For a database <application>Koha</application> uses
      <application>MySQL</application> ??? a free SQL-query-based Relational
      Database Management System. The installation and basic configuration of
      <application>MySQL</application> on a Debian system is quite simple.
      More advanced topics such as database optimization and
      <application>MySQL</application> administration are documented online at
      <ulink
      url="http://www.mysql.com/doc/en/index.html">http://www.mysql.com/doc/en/index.html</ulink>.
      It would be well worth your while to familiarize yourself with the basic
      functionality and behaviour that you can expect from
      <application>MySQL</application>. Chapter 5, <citetitle>Database
      Administration</citetitle>, is especially relevant for using
      <application>Koha</application>.</para>

      <para>To install the <application>MySQL</application> server on your
      <application>Fedora Core</application> machine type:<literallayout>[root at koha]# yum install mysql-server</literallayout>After
      installing <application>MySQL</application> you will need to start it by
      typing:<literallayout>[root at koha]# /etc/init.d/mysqld start</literallayout></para>

      <para>Note that If <application>MySQL</application> fails to start you
      may need to adjust selinux. To do that type the
      following:<literallayout>[root at koha ~]# setenforce 0
[root at koha ~]# mysql_install_db
Preparing db table
Preparing host table
Preparing user table
Preparing func table
Preparing tables_priv table
Preparing columns_priv table
Installing all prepared tables
041201 17:07:25  /usr/libexec/mysqld: Shutdown Complete

To start mysqld at boot time you have to copy support-files/mysql.server
to the right place for your system

PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !
This is done with:
/usr/bin/mysqladmin -u root  password 'new-password'
/usr/bin/mysqladmin -u root -h koha.athenscounty.lib.oh.us  password 'new-password'
See the manual for more instructions.

You can start the MySQL daemon with:
cd /usr ; /usr/bin/safe_mysqld &amp;

You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:
cd sql-bench ; run-all-tests

Please report any problems with the /usr/bin/mysqlbug script!

The latest information about MySQL is available on the web at
http://www.mysql.com
Support MySQL by buying support/licenses at https://order.mysql.com

[root at koha ~]# setenforce 1</literallayout>Then start up
      <application>MySQL</application> again and you should be good to
      go.</para>

      <para>It's a good idea to set the <application>MySQL</application>
      administrator password right away. You will need to have this password
      handy later in the installation so make sure you write it down. You can
      set the password from the command line thusly:<literallayout>[root at koha]# mysqladmin password [type your new password here]</literallayout>but
      leave out the brackets.</para>
    </section>

    <section>
      <title>Apache</title>

      <para>According to the <application>Apache</application> website,
      <application>Apache</application> has been the most popular web server
      on the Internet since April of 1996. Additionally, the October 2003
      <citetitle>Netcraft Web Server Survey</citetitle> found that over 64% of
      websites on the Internet use <application>Apache</application>, making
      it more popular than all other web servers combined. You can see the
      survey at <ulink
      url="http://news.netcraft.com/">http://news.netcraft.com/</ulink>.
      Additionally, you can find out more about the Apache Software Foundation
      on their website at <ulink
      url="http://www.apache.org/">http://www.apache.org/</ulink>.</para>

      <para>We will have to configure <application>Apache</application> for
      <application>Koha</application> later on in the install, but for now you
      should know that <application>Apache</application>'s configuration files
      are kept in <filename>/etc/httpd/conf/httpd.conf</filename> and
      <application>Apache</application>'s log files are in
      <filename>/var/log/httpd</filename>.</para>
    </section>

    <section>
      <title>Conclusion</title>

      <para>Well, that's it, we've installed all the dependencies for
      <application>Koha</application> on <application>Fedora
      Core</application>. Now you are ready to download
      <application>Koha</application> from <ulink
      url="http://www.koha.org">http://www.koha.org</ulink> and install it
      following the directions in the <filename>INSTALL</filename>
      file.</para>
    </section>
  </section>
</article>



From tipaul at users.sourceforge.net  Mon Jan  3 11:48:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:40 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.113,1.114 SearchMarc.pm,1.35,1.36
Message-ID: <E1ClPlQ-0005NA-8H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/C4

Modified Files:
	Biblio.pm SearchMarc.pm 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -r1.113 -r1.114
*** Biblio.pm	10 Dec 2004 16:27:53 -0000	1.113
--- Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
***************
*** 254,258 ****
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
--- 254,258 ----
      $sth =
        $dbh->prepare(
! "select tagfield,tagsubfield,$libfield as lib,tab, mandatory, repeatable,authorised_value,authtypecode,value_builder,kohafield,seealso,hidden,isurl,link from marc_subfield_structure where frameworkcode=? order by tagfield,tagsubfield"
      );
      $sth->execute($frameworkcode);
***************
*** 266,269 ****
--- 266,270 ----
      my $hidden;
      my $isurl;
+ 	my $link;
  
      while (
***************
*** 271,275 ****
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl )
          = $sth->fetchrow
        )
--- 272,276 ----
          $mandatory,     $repeatable, $authorised_value, $authtypecode,
          $value_builder, $kohafield,  $seealso,          $hidden,
!         $isurl,			$link )
          = $sth->fetchrow
        )
***************
*** 286,289 ****
--- 287,291 ----
          $res->{$tag}->{$subfield}->{hidden}           = $hidden;
          $res->{$tag}->{$subfield}->{isurl}            = $isurl;
+         $res->{$tag}->{$subfield}->{link}            = $link;
      }
      return $res;
***************
*** 2633,2636 ****
--- 2635,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.114  2005/01/03 10:48:33  tipaul
+ # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
+ # * partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
+ #
  # Revision 1.113  2004/12/10 16:27:53  tipaul
  # limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items)

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** SearchMarc.pm	10 Dec 2004 16:27:53 -0000	1.35
--- SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
***************
*** 167,170 ****
--- 167,171 ----
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
+ 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
***************
*** 191,198 ****
  	
  	#last minute stripping out of ' and ,
! 	foreach $_ (@$value) {
! 	$_=~ s/\'/ /g;
! 	$_=~ s/\,/ /g;
! 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
--- 192,200 ----
  	
  	#last minute stripping out of ' and ,
! # paul : quoting, it's done a few lines lated.
! # 	foreach $_ (@$value) {
! # 		$_=~ s/\'/ /g;
! # 		$_=~ s/\,/ /g;
! # 	}
  	
  	for(my $i = 0 ; $i <= $#{$value} ; $i++)
***************
*** 202,206 ****
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g;
  		if(@$excluding[$i])	# NOT statements
  		{
--- 204,208 ----
  		# remove % at the beginning
  		@$value[$i] =~ s/^%//g;
! 	    @$value[$i] =~ s/(\.|\?|\:|\!|\'|,|\-|\"|\(|\)|\[|\]|\{|\})/ /g if @$operator[$i] eq "contains";
  		if(@$excluding[$i])	# NOT statements
  		{




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.37,1.38
Message-ID: <E1ClPlV-0005Na-SU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** marc_subfields_structure.tmpl	4 Oct 2004 20:52:11 -0000	1.37
--- marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
***************
*** 137,140 ****
--- 137,141 ----
  			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+ 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
  		<!-- /TMPL_IF -->
  	</td>




From tipaul at users.sourceforge.net  Mon Jan  3 11:48:45 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:48:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.29,1.30
Message-ID: <E1ClPlV-0005NZ-Sn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** MARCdetail.tmpl	22 Dec 2004 10:14:43 -0000	1.29
--- MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
***************
*** 86,91 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 86,95 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 112,117 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 116,125 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 138,143 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 146,155 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 164,169 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 176,185 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 190,195 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 206,215 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 216,221 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 236,245 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 242,247 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 266,275 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 268,273 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 296,305 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 294,299 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 326,335 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
***************
*** 320,325 ****
  				<p>
  					<label class="labelsubfield">
! 					<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&amp;#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 						<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->
--- 356,365 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- TMPL_ELSE -->
! 						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
! 					<!-- /TMPL_IF -->
! 					<img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15" alt="Search on this Field's Value">
  					</a>
  					<!-- TMPL_VAR NAME="marc_subfield" -->




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/C4 Output.pm,1.50,1.51
Message-ID: <E1ClPvE-0005nw-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/C4

Modified Files:
	Output.pm 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** Output.pm	5 Aug 2004 16:35:25 -0000	1.50
--- Output.pm	3 Jan 2005 10:58:46 -0000	1.51
***************
*** 74,78 ****
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
--- 74,78 ----
  
  	my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac, $query);
! 	my $opacstylesheet = C4::Context->preference('opacstylesheet');
  	my $template = HTML::Template->new(filename      => "$htdocs/$theme/$lang/$tmplbase",
  				   die_on_bad_params => 0,
***************
*** 83,86 ****
--- 83,87 ----
  							interface => ($opac ne 'intranet'? '/opac-tmpl': '/intranet-tmpl'),
  							theme => $theme,
+ 							opacstylesheet => $opacstylesheet,
  							lang => $lang);
  




From tipaul at users.sourceforge.net  Mon Jan  3 11:58:48 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 02:58:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-top.inc,1.7,1.8
Message-ID: <E1ClPvE-0005nx-L5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22299/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac-top.inc 
Log Message:
adding "opacstylesheet" systempreference.
if this parameter is defined, the url is used instead of the default one.
So, you can have your own stylesheet somewhere, and use it instead of the official Koha one.

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** opac-top.inc	24 Nov 2004 16:08:55 -0000	1.7
--- opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
***************
*** 4,8 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 4,12 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
***************
*** 20,24 ****
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>
--- 24,28 ----
  	var MSG_NO_RECORD_ADDED = _("No biblio added");
  	function Dopop(link) {
! 		newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
  	}
  	</script>




From tipaul at users.sourceforge.net  Mon Jan  3 12:08:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:08:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.16,1.17 marc-editor.css,1.3,NONE
Message-ID: <E1ClQ4k-0006CP-Le@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23824/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
	opac.css 
Removed Files:
	marc-editor.css 
Log Message:
merging opac.css and marc-editor.css, that is used in MARC view.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac.css	15 Dec 2004 16:03:55 -0000	1.16
--- opac.css	3 Jan 2005 11:08:36 -0000	1.17
***************
*** 355,357 ****
  	padding-left:8pt;
  	float:left;
! }
\ No newline at end of file
--- 355,403 ----
  	padding-left:8pt;
  	float:left;
! }
! 
! /* for MARC view  */
! div.tabs {
! 	width:10px;
! 	position:absolute;
! 	display:block;
! 	margin-left:50px;
! 	margin-top:150px;
! }
! 
! div.tabs a {
! 	display:block;
! 	font-size: small;
! 	border: thin solid black;
! 	margin-right: 2px;
! 	padding: 10px 10px;
! 	-moz-border-radius: 5px 0px 0px 5px;
! }
! 
! div.tab {
! 	background-color: #ACE6E6;
! 	display: block;
! 	visibility:hidden;
! 	position:absolute;
! 	margin-left:72px;
! 	margin-top:150px;
! 	margin-right:10%;
! }
! td {
! 	border:0px;
! }
! 
! .MARCtag { /* style for tag definition (700 - Statement of responsability) */
! 	font-weight:bold;
! 	color:#FF6600;
! 	background-color:FFFFFF;
! 	background-image:none;
! 	border-bottom: thin solid #FF6600;
! 	margin-right:30%;
! }
! 
! .labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
! 	float:left;
! 	width: 12em;
! 	margin-left:30px;
! }

--- marc-editor.css DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:36 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.2,1.3
Message-ID: <E1ClQ5g-0006Ev-Gn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/opac

Modified Files:
	opac-shelves.pl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.pl	12 Nov 2004 16:27:33 -0000	1.2
--- opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
--- 34,47 ----
  my $env;
  my $query = new CGI;
+ my $headerbackgroundcolor='#663266';
+ my $circbackgroundcolor='#555555';
+ my $circbackgroundcolor='#550000';
+ my $linecolor1='#bbbbbb';
+ my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
***************
*** 58,80 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					     LibraryName => C4::Context->preference("LibraryName"),
! 					});
  SWITCH: {
! 	if ($query->param('viewshelf')) {  viewshelf($query->param('viewshelf')); last SWITCH;}
! 	if ($query->param('shelves')) {  shelves(); last SWITCH;}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color=1;
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}= 1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
  ;
  		push (@shelvesloop, \%line);
--- 63,108 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
! 	if ($query->param('op') eq 'modifsave') {
! 		ModifShelf($query->param('shelfnumber'),$query->param('shelfname'),$loggedinuser,$query->param('category'));
! 		last SWITCH;
! 	}
! 	if ($query->param('op') eq 'modif') {
! 		my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($query->param('shelf'));
! 		$template->param(edit => 1,
! 						shelfnumber => $shelfnumber,
! 						shelfname => $shelfname,
! 						"category$category" => 1);
! # 		editshelf($query->param('shelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('viewshelf')) {
! 		viewshelf($query->param('viewshelf'));
! 		last SWITCH;
! 	}
! 	if ($query->param('shelves')) {
! 		shelves();
! 		last SWITCH;
! 	}
  }
  
  ($shelflist) = GetShelfList($loggedinuser,2); # rebuild shelflist in case a shelf has been added
  
! my $color='';
  my @shelvesloop;
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}= $color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'};
+ 		$line{"category".$shelflist->{$element}->{'category'}} = 1;
+ 		$line{'mine'} = 1 if $shelflist->{$element}->{'owner'} eq $loggedinuser;
  		$line{'shelfbookcount'}=$shelflist->{$element}->{'count'};
  		$line{'canmanage'} = ShelfPossibleAction($loggedinuser,$element,'manage');
+ 		$line{'firstname'}=$shelflist->{$element}->{'firstname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
+ 		$line{'surname'}=$shelflist->{$element}->{'surname'} unless $shelflist->{$element}->{'owner'} eq $loggedinuser;
  ;
  		push (@shelvesloop, \%line);
***************
*** 84,87 ****
--- 112,123 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
+ # sub editshelf {
+ # 	my ($shelfnumber) = @_;
+ # 	my ($shelfnumber,$shelfname,$owner,$category) = GetShelf($shelfnumber);
+ # 	$template->param(edit => 1,
+ # 					shelfnumber => $shelfnumber,
+ # 					shelfname => $shelfname,
+ # 					"category$category" => 1);
+ # }
  sub shelves {
  	if (my $newshelf=$query->param('addshelf')) {
***************
*** 107,116 ****
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color=1;
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
--- 143,152 ----
  	$template->param(paramsloop => \@paramsloop);
  	my ($shelflist) = GetShelfList($loggedinuser,2);
! 	my $color='';
  	my @shelvesloop;
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'shelf'}=$element;
  		$line{'shelfname'}=$shelflist->{$element}->{'shelfname'} ;
***************
*** 129,143 ****
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color=1;
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		$line{'color'}=1 if ($color eq 1);
! 		$color = -$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{'biblionumber'} = $item->{'biblionumber'};
  		push(@itemsloop, \%line);
  	}
--- 165,179 ----
  	my ($itemlist) = GetShelfContents($env, $shelfnumber);
  	my $item='';
! 	my $color='';
  	my @itemsloop;
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
! 		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
  		$line{'barcode'}=$item->{'barcode'};
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
! 		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
  	}
***************
*** 152,160 ****
  #
  # $Log$
! # Revision 1.2  2004/11/12 16:27:33  tipaul
! # fixes for printing a biblio
  #
! # Revision 1.1  2004/03/15 15:02:19  tipaul
! # adding virtual shelves to opac
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul
--- 188,209 ----
  #
  # $Log$
! # Revision 1.3  2005/01/03 11:09:34  tipaul
! # synch'ing virtual shelves management in opac with the librarian one, that has more features
! #
! # Revision 1.5  2004/12/16 11:30:57  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf name & status
! #
! # Revision 1.4  2004/12/15 17:28:23  tipaul
! # adding bookshelf features :
! # * create bookshelf on the fly
! # * modify a bookshelf (this being not finished, will commit the rest soon)
! #
! # Revision 1.3  2004/12/02 16:38:50  tipaul
! # improvement in book shelves
  #
! # Revision 1.2  2004/11/19 16:31:30  tipaul
! # bugfix for bookshelves not in official CVS
  #
  # Revision 1.1.2.1  2004/03/10 15:08:18  tipaul




From tipaul at users.sourceforge.net  Mon Jan  3 12:09:37 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:09:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-detail.tmpl,1.14,1.15 opac-ISBDdetail.tmpl,1.3,1.4 opac-main.tmpl,1.15,1.16 opac-MARCdetail.tmpl,1.4,1.5 opac-shelves.tmpl,1.1,1.2
Message-ID: <E1ClQ5h-0006F5-HJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl opac-ISBDdetail.tmpl opac-main.tmpl 
	opac-MARCdetail.tmpl opac-shelves.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
synch'ing virtual shelves management in opac with the librarian one, that has more features

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.tmpl	22 Nov 2004 16:18:11 -0000	1.14
--- opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
***************
*** 3,11 ****
  
  <div id="bibliomenu">
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,17 ----
  
  <div id="bibliomenu">
+ 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
+ 		Simple
+ 	</a>
+ 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
+ 		Complete
+ 	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-ISBDdetail.tmpl	28 Nov 2004 08:58:04 -0000	1.3
--- opac-ISBDdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.4
***************
*** 3,10 ****
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
--- 3,16 ----
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
  	</a>
  	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
***************
*** 16,19 ****
--- 22,31 ----
  		</a>
  	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
+ 	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-main.tmpl	8 Dec 2004 10:26:32 -0000	1.15
--- opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
***************
*** 4,14 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/opac.css" />
  	<title><!--TMPL_VAR name="LibraryName"--></title>
- 	<style type="text/css">
- 	input {
- 		background-color: #ACE6E6;
- 	}
- 	</style>
  </head>
  
--- 4,13 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
! 	<!-- TMPL_IF name="opacstylesheet" -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
! 	<!-- TMPL_ELSE -->
! 		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
! 	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
  

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-MARCdetail.tmpl	12 Nov 2004 16:28:10 -0000	1.4
--- opac-MARCdetail.tmpl	3 Jan 2005 11:09:33 -0000	1.5
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
- <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_IF NAME="norequests" -->
! 	<!-- TMPL_ELSE -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
  	<!-- /TMPL_IF -->
  </div>
  
--- 1,30 ----
  <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
  <div id="bibliomenu">
  	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
  	</a>
  	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
  		ISBD
  	</a>
+ 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+ 		Add to shelf
+ 	</a>
  	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
  		Print
  	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
  		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
  			Request
  		</a>
+ 	<!-- /TMPL_UNLESS -->
+ 	<!-- TMPL_IF name="subscriptionid" -->
+ 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
+ 		Issues
+ 	</a>
  	<!-- /TMPL_IF -->
+ 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-shelves.tmpl	15 Mar 2004 15:01:49 -0000	1.1
--- opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
***************
*** 2,160 ****
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
!     <table>
!     		<tr>
! 			<th colspan=4>
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
! 		</tr>
! 		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
! 					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="button">Shelf list</a>
! 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type=hidden name=modifyshelfcontents value=1>
! 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<!-- TMPL_IF name="manageshelf" -->
! 		<input type=submit value="Remove Selected Items" class="button">
  	<!-- /TMPL_IF -->
- </form>
- <!-- TMPL_IF name="manageshelf" -->
- <form>
- 	<input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<input type=hidden name=modifyshelfcontents value=1>
- 	<input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 	<table>
- 		<tr>
- 			<td>
- 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
- 			</td>
- 			<td>
- 				<input name="addbarcode">
- 				<input type=hidden name=modifyshelfcontents value=1>
- 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
- 				<input type="submit" value="Save" class="button">
- 			</td>
- 		</tr>
- 	</table>
- </form>
- <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color=red><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color=red><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<center>
! 		<h1>Bookshelves</h1>
! 		<table border=0 cellpadding=7>
! 			<tr>
! 				<td align=center valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="button">Shelf list</a>
! 						</p>
! 					</form>
! 				</td>
! 				<td align=center valign="bottom">
! 					<form method=post>
! 					<input type="hidden" name="shelves" value=1>
! 					<table border=0 cellpadding=0 cellspacing=0>
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
- 					</table>
  					<p>
! 						<input type=submit value="Delete Shelves" class="button"></form>
  					</p>
- 				</td>
- 				<td align=center valign=bottom>
- 					<form method=post>
- 					<input type=hidden name=shelves value=1>
- 					<table border=0 cellpadding=0 cellspacing=0>
- 						<tr>
- 							<th>
- 								<font color=white>Add Shelf</font>
- 							</th>
- 						</tr>
- 						<tr>
- 							<td>
- 								<p>Name : <input type="text" name="addshelf" size="25"></p>
- 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
- 								<p>Category : <select name="category">
- 									<option value="1">Private</option>
- 									<option value="2">Public</option>
- 									<option value="3">Free</option>
- 									</select>
- 								</p>
- 								<p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
- 									<li> A public can be seen by everybody, but managed only by you.</li>
- 									<li> A free can be managed by any user.</li>
- 								</p>
- 							</td>
- 						</tr>
- 					</table>
- 								<p><input type=submit value="Add New Shelf" class="button"></p>
  					</form>
! 				</td>
! 			</tr>
! 		</table>
  
  	<!-- TMPL_ELSE -->
! 		<center>
! 		<table border=0 cellpadding=4 cellspacing=0>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
--- 2,189 ----
  <div id="mainbloc">
  <!-- TMPL_IF Name="viewshelf" -->
! 	<form>
! 		<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div>
! 		<h2>Shelf content</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th>delete</th>
! 					<th>barcode</th>
! 					<th>title</th>
! 					<th>Author</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Remove Selected Items" class="button">
! 			<!-- /TMPL_IF -->
! 			<a href="opac-shelves.pl" class="button">Shelf list</a>
! 		</div>
! 	</form>
! 
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
! 		<form>
! 		<h2>Add a book by barcode</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Save" class="button">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1>Bookshelves</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
! 					<h2>Select Shelves to Delete</h2>
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
! 						<p>
! 							<label>
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
! 							</label>
! 								<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
! 						</p>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					<p>
! 						<input type="submit" value="Delete Shelves" class="button">
  					</p>
  					</form>
! 		</div>
! 		<div id="bloc60">
! 			<form method="post">
! 				<input type="hidden" name="shelves" value="1">
! 				<h2>Add Shelf</h2>
! 				<p><label>Name</label><input type="text" name="addshelf" size="25"></p>
! 				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
! 				<p><label>Category</label>
! 					<select name="category">
! 						<option value="1">Private</option>
! 						<option value="2">Public</option>
! 						<option value="3">Free</option>
! 					</select>
! 				</p>
! 				<ul> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 					<li> A public can be seen by everybody, but managed only by you.</li>
! 					<li> A free can be managed by any user.</li>
! 				</ul>
! 				<p>
! 					<input type="submit" value="Add New Shelf" class="button">
! 					<a href="opac-shelves.pl" class="button">back to shelf list</a>
! 				</p>
  
+ 			</form>
+ 		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
! 			<h2>Shelf list</h2>
! 			<table class="small">
! 				<tr>
! 					<th>Shelf name</th>
! 					<th>Category</th>
! 					<th>Content size</th>
! 					<th>Modify</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Private
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Public
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Free
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
! 							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc20">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2>Modify shelf</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Name</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Category</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Private</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Private</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Public</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Public</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Free</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Free</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
+ 				<li> A public can be seen by everybody, but managed only by you.</li>
+ 				<li> A free can be managed by any user.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Save" class="button">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="opac-bottom.inc" -->




From tipaul at users.sourceforge.net  Mon Jan  3 12:10:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:10:01 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,NONE,1.1
Message-ID: <E1ClQ65-0006GC-Kz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24046/opac

Added Files:
	opac-addbookbybiblionumber.pl 
Log Message:


--- NEW FILE ---
#!/usr/bin/perl
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
# $Header: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v 1.1 2005/01/03 11:09:59 tipaul 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::Search;
use C4::Biblio;
use CGI;
use C4::Output;
use C4::BookShelves;
use C4::Circulation::Circ2;
use C4::Auth;
use C4::Interface::CGI::Output;
use HTML::Template;

my $env;
my $query = new CGI;
my $biblionumber = $query->param('biblionumber');
my $shelfnumber = $query->param('shelfnumber');
my $newbookshelf = $query->param('newbookshelf');
my $category = $query->param('category');

my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "opac-addbookbybiblionumber.tmpl",
							query => $query,
							type => "opac",
							authnotrequired => 0,
						});

my $x; # for trash
($x,$x,$shelfnumber) = AddShelf('',$newbookshelf,$loggedinuser,$category) if $newbookshelf;

if ($shelfnumber) {
	&AddToShelfFromBiblio($env, $biblionumber, $shelfnumber);
	print "Content-Type: text/html\n\n<html><body onload=\"window.close()\"></body></html>";
	exit;
} else {

	my  ( $bibliocount, @biblios )  = getbiblio($biblionumber);

	my ($shelflist) = GetShelfList($loggedinuser,3);
	my @shelvesloop;
	my %shelvesloop;
	foreach my $element (sort keys %$shelflist) {
			push (@shelvesloop, $element);
			$shelvesloop{$element} = $shelflist->{$element}->{'shelfname'};
	}

	my $CGIbookshelves=CGI::scrolling_list( -name     => 'shelfnumber',
				-values   => \@shelvesloop,
				-labels   => \%shelvesloop,
				-size     => 1,
				-multiple => 0 );

	$template->param(biblionumber => $biblionumber,
						title => $biblios[0]->{'title'},
						author => $biblios[0]->{'author'},
						CGIbookshelves => $CGIbookshelves,
						);

	output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: opac-addbookbybiblionumber.pl,v $
# Revision 1.1  2005/01/03 11:09:59  tipaul
# *** empty log message ***
#

# Local Variables:
# tab-width: 4
# End:




From tipaul at users.sourceforge.net  Mon Jan  3 12:11:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 03:11:13 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.86,1.87
Message-ID: <E1ClQ7F-0006Ku-U3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24344/misc

Modified Files:
	Install.pm 
Log Message:
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** Install.pm	15 Dec 2004 14:39:21 -0000	1.86
--- Install.pm	3 Jan 2005 11:11:10 -0000	1.87
***************
*** 1772,1776 ****
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv,lock_tables_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1772,1776 ----
  	startsysout();
  	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login




From tipaul at users.sourceforge.net  Mon Jan  3 13:55:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:55:40 -0800
Subject: [Koha-cvs] CVS: koha/misc koha.mysql,1.9,1.10
Message-ID: <E1ClRkK-0002Uw-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9571/misc

Modified Files:
	koha.mysql 
Log Message:
adding an index

Index: koha.mysql
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.mysql,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** koha.mysql	12 Nov 2004 16:39:48 -0000	1.9
--- koha.mysql	3 Jan 2005 12:55:22 -0000	1.10
***************
*** 925,929 ****
  # Structure de la table `marc_subfield_structure`
  #
- 
  CREATE TABLE marc_subfield_structure (
    tagfield char(3) NOT NULL default '',
--- 925,928 ----
***************
*** 945,949 ****
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------
--- 944,949 ----
    PRIMARY KEY  (frameworkcode,tagfield,tagsubfield),
    KEY tab (frameworkcode,tab),
!   KEY kohafield (frameworkcode,kohafield),
!   KEY kohafield_2 (kohafield)
  ) TYPE=MyISAM;
  # --------------------------------------------------------




From tipaul at users.sourceforge.net  Mon Jan  3 13:56:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:56:32 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.31,1.32
Message-ID: <E1ClRlA-0002XZ-Op@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9753/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** marc_subfields_structure.pl	8 Dec 2004 10:41:38 -0000	1.31
--- marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
***************
*** 380,383 ****
--- 380,384 ----
  		$row_data{hidden}	= $results->[$i]{'hidden'};
  		$row_data{isurl}	= $results->[$i]{'isurl'};
+ 		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
  		$row_data{bgcolor} = $toggle;




From tipaul at users.sourceforge.net  Mon Jan  3 13:57:24 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:57:24 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.24,1.25
Message-ID: <E1ClRm0-0002Zh-8A@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9893

Modified Files:
	MARCdetail.pl 
Log Message:
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.

Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** MARCdetail.pl	22 Dec 2004 10:14:43 -0000	1.24
--- MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
***************
*** 74,78 ****
  
  my $record =MARCgetbiblio($dbh,$bibid);
- warn "=>".$record->as_formatted;
  # open template
  my ($template, $loggedinuser, $cookie)
--- 74,77 ----
***************
*** 96,100 ****
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
--- 95,99 ----
  	my @subfields_data;
  	for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! # 		warn "$tabloop => $x_i";
  		# if tag <10, there's no subfield, use the "@" trick
  		if ($fields[$x_i]->tag()<10) {
***************
*** 116,119 ****
--- 115,119 ----
  				my %subfield_data;
  				$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
+ 				$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
  				if ($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
  					$subfield_data{marc_value}="<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";




From tipaul at users.sourceforge.net  Mon Jan  3 13:58:01 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:58:01 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools - New directory
Message-ID: <E1ClRmb-0002av-I7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9933/misc/migration_tools

Log Message:
Directory /cvsroot/koha/koha/misc/migration_tools added to the repository





From tipaul at users.sourceforge.net  Mon Jan  3 13:59:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 04:59:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools buildLANG.pl,NONE,1.1
Message-ID: <E1ClRoN-0002fT-Ew@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10247/misc/migration_tools

Added Files:
	buildLANG.pl 
Log Message:
Auto-build LANG authorized values

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
# use MARC::File::USMARC;
# use MARC::Record;
# use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $fields, $number,$language) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$fields,
    'v' => \$verbose,
	'l:s' => \$language,
);

if ($version or !$fields) {
	print <<EOF
Small script to recreate the LANG list in authorised values from existing langs in the catalogue.
This script is useful when you migrate your datas with bulkmarcimport.pl as it populates parameters tables that are not modified by bulkmarcimport.

parameters :
\th : this version/help screen
\ts : the field or field list where the lang codes are stored.
\td : delete every entry of LANG category before doing work.
\tl : the language of the language list (fr or en for instance)

The table is populated with iso codes and meaning (in french).
If the complete language name is unknown, the code is used instead and you will be warned by the script

SAMPLES :
 ./buildLANG -d -s "('101a','101b')"
EOF
;#
exit;
}

my %codesiso;

%codesiso = (
	'eng' => 'english',
	'fre' => 'french'
	);

%codesiso = (
	'mis' => 'diverses',
	'und' => 'inconnue',
	'mul' => 'multilingue',
	'ger' => 'allemand',
	'eng' => 'anglais',
	'ara' => 'arabe',
	'arm' => 'arm?nien',
	'baq' => 'basque',
	'ber' => 'berbere',
	'bre' => 'breton',
	'bul' => 'bulgare',
	'cat' => 'catalan',
	'chi' => 'chinois',
	'cro' => 'croate',
	'dan' => 'danois',
	'spa' => 'espagnol',
	'esp' => 'esp?ranto',
	'fin' => 'finnois',
	'fra' => 'fran?ais ancien',
	'fre' => 'fran?ais',
	'wel' => 'gallois',
	'grc' => 'grec classique',
	'gre' => 'grec moderne',
	'heb' => 'h?breu',
	'hun' => 'hongrois',
	'ita' => 'italien',
	'jap' => 'japonais',
	'lat' => 'latin',
	'dut' => 'n?erlandais',
	'nor' => 'norv?gien',
	'pol' => 'polonais',
	'por' => 'portugais',
	'rum' => 'roumain',
	'rus' => 'russe',
	'ser' => 'serbe',
	'swe' => 'suedois',
	'cze' => 'tch?que',
	'tur' => 'turc',
	'ukr' => 'ukraine',
	'slo' => 'slov?ne',
	'scr' => 'serbo-croate',
	) if $language eq 'fr';

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting lang list\n";
	$dbh->do("delete from authorised_values where category='LANG'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
my $starttime = gettimeofday;

my $sth = $dbh->prepare("SELECT DISTINCT subfieldvalue FROM marc_subfield_table WHERE tag + subfieldcode IN $fields order by subfieldvalue");

$sth->execute;
my $i=1;

print "=========================\n";
my $sth2 = $dbh->prepare("insert into authorised_values (category, authorised_value, lib) values (?,?,?)");
while (my ($langue) = $sth->fetchrow) {
	$sth2->execute('LANG',$langue,$langue?$codesiso{$langue}:$langue);
	print "lang : $langue is unknown is iso list\n" unless $codesiso{$langue};
}
print "=========================\n";




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc bulkmarcimport.pl,1.9,NONE
Message-ID: <E1ClU5g-000225-P0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc

Removed Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- bulkmarcimport.pl DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 16:25:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 07:25:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools bulkmarcimport.pl,NONE,1.1
Message-ID: <E1ClU5g-000220-CS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/misc/migration_tools

Added Files:
	bulkmarcimport.pl 
Log Message:
moving bulkmarcimport script to migration_tools directory

--- NEW FILE ---
#!/usr/bin/perl
# small script that import an iso2709 file into koha 2.0

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $delete, $test_parameter,$char_encoding, $verbose);
GetOptions(
    'file:s'    => \$input_marc_file,
    'n' => \$number,
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'c:s' => \$char_encoding,
    'v:s' => \$verbose,
);

if ($version || ($input_marc_file eq '')) {
	print <<EOF
small script to import an iso2709 file into Koha.
parameters :
\th : this version/help screen
\tfile /path/to/file/to/dump : the file to dump
\tv : verbose mode. 1 means "some infos", 2 means "MARC dumping"
\tn : the number of the record to import. If missing, all the file is imported
\tt : test mode : parses the file, saying what he would do, but doing nothing.
\tc : the char encoding. At the moment, only MARC21 and UNIMARC supported. MARC21 by default.
\d : delete EVERYTHING related to biblio in koha-DB before import  :tables :
\t\tbiblio, \t\tbiblioitems, \t\tsubjects,\titems
\t\tadditionalauthors, \tbibliosubtitles, \tmarc_biblio,
\t\tmarc_subfield_table, \tmarc_word, \t\tmarc_blob_subfield
IMPORTANT : don't use this script before you've entered and checked twice (or more) your  MARC parameters tables.
If you fail this, the import won't work correctly and you will get invalid datas.

SAMPLE : ./bulkmarcimport.pl -file /home/paul/koha.dev/local/npl -n 1
EOF
;#'
die;
}

my $dbh = C4::Context->dbh;

if ($delete) {
	print "deleting biblios\n";
	$dbh->do("delete from biblio");
	$dbh->do("delete from biblioitems");
	$dbh->do("delete from items");
	$dbh->do("delete from bibliosubject");
	$dbh->do("delete from additionalauthors");
	$dbh->do("delete from bibliosubtitle");
	$dbh->do("delete from marc_biblio");
	$dbh->do("delete from marc_subfield_table");
	$dbh->do("delete from marc_word");
	$dbh->do("delete from marc_blob_subfield");
}
if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}

$char_encoding = 'MARC21' unless ($char_encoding);
print "CHAR : $char_encoding\n" if $verbose;
my $starttime = gettimeofday;
my $batch = MARC::Batch->new( 'USMARC', $input_marc_file );
$batch->warnings_off();
$batch->strict_off();
my $i=0;
#1st of all, find item MARC tag.
my ($tagfield,$tagsubfield) = &MARCfind_marc_from_kohafield($dbh,"items.itemnumber",'');
# $dbh->do("lock tables biblio write, biblioitems write, items write, marc_biblio write, marc_subfield_table write, marc_blob_subfield write, marc_word write, marc_subfield_structure write, stopwords write");
while ( my $record = $batch->next() ) {
	$i++;
	#now, parse the record, extract the item fields, and store them in somewhere else.

    ## create an empty record object to populate
    my $newRecord = MARC::Record->new();

    # go through each field in the existing record
    foreach my $oldField ( $record->fields() ) {

	# just reproduce tags < 010 in our new record
	if ( $oldField->tag() < 10 ) {
	    $newRecord->append_fields( $oldField );
	    next();
	}

	# store our new subfield data in this list
	my @newSubfields = ();

	# go through each subfield code/data pair
	foreach my $pair ( $oldField->subfields() ) { 
		$pair->[1] =~ s/\<//g;
		$pair->[1] =~ s/\>//g;
		push( @newSubfields, $pair->[0], char_decode($pair->[1],$char_encoding) );
	}

	# add the new field to our new record
	my $newField = MARC::Field->new(
	    $oldField->tag(),
	    $oldField->indicator(1),
	    $oldField->indicator(2),
	    @newSubfields
	);

	$newRecord->append_fields( $newField );

    }


	warn "$i ==>".$newRecord->as_formatted() if $verbose eq 2;
	my @fields = $newRecord->field($tagfield);
	my @items;
	my $nbitems=0;

	foreach my $field (@fields) {
		my $item = MARC::Record->new();
		$item->append_fields($field);
		push @items,$item;
		$newRecord->delete_field($field);
		$nbitems++;
	}
	print "$i : $nbitems items found\n" if $verbose;
	# now, create biblio and items with NEWnewXX call.
	unless ($test_parameter) {
		my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'');
		warn "ADDED biblio NB $bibid in DB\n" if $verbose;
		for (my $i=0;$i<=$#items;$i++) {
			NEWnewitem($dbh,$items[$i],$bibid);
		}
	}
}
# $dbh->do("unlock tables");
my $timeneeded = gettimeofday - $starttime;
print "$i MARC record done in $timeneeded seconds";




From tipaul at users.sourceforge.net  Mon Jan  3 17:12:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:12:31 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator default_intranet_pl_PL.po,1.13,NONE default_opac_pl_PL.po,1.9,NONE
Message-ID: <E1ClUop-0004nJ-Pg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18406

Removed Files:
	default_intranet_pl_PL.po default_opac_pl_PL.po 
Log Message:
removing .po in the wrong place (is in po/ now)

--- default_intranet_pl_PL.po DELETED ---

--- default_opac_pl_PL.po DELETED ---




From tipaul at users.sourceforge.net  Mon Jan  3 17:30:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Mon, 03 Jan 2005 08:30:16 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,NONE,1.1 translator_doc.txt,1.5,1.6
Message-ID: <E1ClV60-00062S-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23202

Modified Files:
	translator_doc.txt 
Added Files:
	rebuild_lang.sh 
Log Message:
updating doc & adding a script to rebuild officially supported languages

--- NEW FILE ---
#!/bin/sh
./tmpl_process3.pl install -r -s po/css_opac_fr_FR.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/fr
./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr

./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW

./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** translator_doc.txt	30 Dec 2004 06:58:19 -0000	1.5
--- translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
***************
*** 22,27 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,26 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 34,40 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /
!         home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 33,37 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 47,52 ****
   1. Update your translation file:
     
!         ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 44,48 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 54,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
--- 50,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
+  
+ REBUILD ALL
+ ===========
+ The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
+ Useful for developpers, probably useless for all end-users.
+ 
  
  WEAKNESSES
***************
*** 71,74 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 
--- 71,73 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan  4 21:21:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 12:21:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/barcodes barcodes.tmpl,1.3,1.4
Message-ID: <E1ClvAq-0002XW-SF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9686/koha-tmpl/intranet-tmpl/default/en/barcodes

Modified Files:
	barcodes.tmpl 
Log Message:
Corrections to English and minor corrections to HTML

Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** barcodes.tmpl	19 Oct 2004 11:50:18 -0000	1.3
--- barcodes.tmpl	4 Jan 2005 20:20:52 -0000	1.4
***************
*** 1,186 ****
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div class="countryPanel" style="position:absolute" id="addCountryCode">

!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">

! 		<input type="hidden" name="addCode" value="1">

! 		<table style="background-color:#EFEFEF;border:1px" align="center">

! 			<tr>

! 				<th colspan="2">

! 					Add a new Country Code

! 				</th>

! 			</tr>

! 			<tr>

! 				<td>

! 					Country Name&nbsp<input type="text" size="10" id="countryName" name="countryName"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 				<td>

! 					Country Code&nbsp<input type="text" size="3" id="countryCode" name="countryCode"  

! 					                        style="background-color:#FFFFFF;color:Black"/>

! 				</td>

! 			</tr>

! 			<tr>

! 				<td align="right">

! 					<input type="submit" name="submit" id="submit" value="Save Code"/>

! 				</td>

! 				<td align="left">

! 					<input type="button" name="cancel" id="cancel" value="Cancel"

! 					       onclick="javascript: document.getElementById('addCountryCode').style.display = 'none'"/>

! 				</td>

! 			</tr>

! 		</table>

! 	</form>

! </div>

! 

! <!-- ******************************************************************************************************** -->

! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->

! <!-- ******************************************************************************************************** -->

! 

! <div id="mainbloc">

! 	<h1>Barcodes Generator</h1>

! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

! 		<tr valign="center">

! 			<td><font size="4">Generate barcodes from inventary codes</font></td>

! 		</tr>

! 	</table>

! 	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>Select the standard type to generate barcodes.</li>

! 		<li>Define the page size for output the PDF.</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

! 		</li>

! 	</ul>

! 	<br>

! 	<form id="formulario" method="POST" action='<!-- TMPL_VAR NAME="SCRIPT_NAME" -->' name="form1"

! 	      onsubmit="return checkFields(this);" target="_blank">

! 		

! 		<table cellpadding="3" border=0 class="myTable">

! 			<!-- TMPL_IF NAME="ERROR" -->

! 			<tr align="center">

! 				<td colspan="2" >

! 					<p style="font-size:13pt;color:red">Can't find inventary codes on that range. Please try again.</p>

! 				</td>

! 			</tr>

! 			<!-- /TMPL_IF -->

!   			<tr valign="top">

! 				<td align="right" style="width:50%;padding-right:20px"> 

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Type of Interval</td>

! 						</tr>

! 						<tr align="right">

! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="width:50%;padding-left:20px"> 

! 					<div id="continuous" class="panel" style="display:inline">

! 						<table class="ranges">

! 							<tr>

! 					   			<td>From:</td> 

! 								<td><input id="from" type="text" name="from" size="20"></td>

! 							</tr>

! 							<tr>

! 					   			<td>To:</td>

! 								<td><input id="to" type="text" name="to" size="20"></td>

! 							</tr>

! 						</table>

! 					</div> 

!  				    <div id="individuals" class="panel" style="display:none">

! 						<table class="ranges">

! 							<tr valign="top">

! 								<td width="5%">

! 									Inventary Code <BR>

! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">

! 								<td>

! 								<td align="center">	

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"

! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">

! 								</td>

! 								<td width="95%">		   

! 									<select id='inventaryList' size='5' style="width:150px">

! 									</select>

! 									<input type="hidden" id='individualCodes' name="individualCodes">																						

! 								</td>

! 							</tr>

! 						</table>	

! 					</div>						

! 				</td> <!-- Fin Rangos -->

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-right:20px">

! 					<table style="border:0px">

! 						<tr align="right">

! 							<td>Country Code</td>

! 						</tr>

! 						<tr align="right">

! 							<td>

! 								<div style="display:inline">

! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" 

! 									     style="vertical-align:bottom;cursor:pointer"

! 									     onclick="javascript: addCountryCode()">

! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->

! 								</div>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 				<td style="padding-left:20px"> 

! 					<table style="border:0px">

! 						<tr>

! 							<td>Page Size</td>

! 						</tr>

! 						<tr>

! 							<td>

! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"

! 								       size="10">

! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>

! 							</td>

! 						</tr>

! 					</table>

! 				</td>

! 			</tr>

! 			<tr> 

! 				<td align="right" style="padding-left:20px">Text under label</td>

! 				<td>

! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be put instead

! 				</td>

! 			</tr>

!   			<tr valign="top">

!   			    <td colspan="2" align="center">

! 			    	<table style='width:50%'>

! 						<tr style="border-color:#000FCD">

! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>

! 						</tr>

! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->

! 							<tr style="align:left">

! 								<!-- TMPL_LOOP NAME="columns" -->

! 									<td style="border:1px solid #000000">

! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->"      

! 										       name="label" <!-- TMPL_VAR NAME="check" -->>

! 										       Label  <!-- TMPL_VAR NAME="labelname" -->

! 									</td>

! 								<!-- /TMPL_LOOP -->

! 							</tr>

! 						<!-- /TMPL_LOOP -->  			    

! 					</table>

! 				</td>

!   			</tr>

!   			<tr valign="top">

!   			    <td align="right">

! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">

! 				</td>

!   			    <td align="left">

!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">

! 				</td>

!   			</tr>

! 		</table>		

! 	</form>

! </div>

! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->

--- 1,180 ----
! <!-- TMPL_INCLUDE NAME="barcodes-top.inc" -->
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                             START OF ADD COUNTRY CODE PANEL                                ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div class="countryPanel" style="position:absolute" id="addCountryCode">
!  	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
! 		<input type="hidden" name="addCode" value="1">
! 		<table style="background-color:#EFEFEF;border:1px" align="center">
! 			<tr>
! 				<th colspan="2">
! 					Add a new Country Code
! 				</th>
! 			</tr>
! 			<tr>
! 				<td>
! 					Country Name &nbsp;<input type="text" size="10" id="countryName" name="countryName"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 				<td>
! 					Country Code &nbsp;<input type="text" size="3" id="countryCode" name="countryCode"  
! 					                        style="background-color:#FFFFFF;color:Black"/>
! 				</td>
! 			</tr>
! 			<tr>
! 				<td align="right">
! 					<input type="submit" name="submit" id="submit" value="Save Code"/>
! 				</td>
! 				<td align="left">
! 					<input type="button" name="cancel" id="cancel" value="Cancel"
! 					       onclick="document.getElementById('addCountryCode').style.display = 'none'"/>
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
! </div>
! 
! <!-- ******************************************************************************************************** -->
! <!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
! <!-- ******************************************************************************************************** -->
! 
! <div id="mainbloc">
! 	<h1>Barcodes Generator</h1>
! 	<table bgcolor="#ffcc00" width="80%" cellpadding="3">
! 		<tr valign="center">
! 			<td><font size="4">Generate barcodes from inventory codes</font></td>
! 		</tr>
! 	</table>
! 	<ul>
! 		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
! 		<li>Select the standard type to generate barcodes.</li>
! 		<li>Define the page size for output the PDF.</li>
! 		<li>Depending on page size, Koha will show you how the page is arranged
! 		    for each barcode. You can define wich point to start printing the page.
! 		</li>
! 	</ul>
! 	<br>
! 	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
! 		
! 		<table cellpadding="3" border=0 class="myTable">
! 			<!-- TMPL_IF NAME="ERROR" -->
! 			<tr align="center">
! 				<td colspan="2" >
! 					<p style="font-size:13pt;color:red">Can't find inventory codes in that range. Please try again.</p>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_IF -->
!   			<tr valign="top">
! 				<td align="right" style="width:50%;padding-right:20px"> 
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Type of Interval</td>
! 						</tr>
! 						<tr align="right">
! 							<td><!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="width:50%;padding-left:20px"> 
! 					<div id="continuous" class="panel" style="display:inline">
! 						<table class="ranges">
! 							<tr>
! 					   			<td>From:</td> 
! 								<td><input id="from" type="text" name="from" size="20"></td>
! 							</tr>
! 							<tr>
! 					   			<td>To:</td>
! 								<td><input id="to" type="text" name="to" size="20"></td>
! 							</tr>
! 						</table>
! 					</div> 
!  				    <div id="individuals" class="panel" style="display:none">
! 						<table class="ranges">
! 							<tr valign="top">
! 								<td width="5%">
! 									Inventory Code <BR>
! 									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
! 								<td>
! 								<td align="center">	
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/rightarrow.png" onclick="addItem()"
! 									     border="0" onclick="javascript: addItem();" style="cursor:pointer" style="display:table-cell">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/leftarrow.png" onclick="javascript: removeItem();" border="0" style="cursor:pointer" style="display:table-cell">
! 								</td>
! 								<td width="95%">		   
! 									<select id="inventaryList" size="5" style="width:150px">
! 									</select>
! 									<input type="hidden" id="individualCodes" name="individualCodes">																						
! 								</td>
! 							</tr>
! 						</table>	
! 					</div>						
! 				</td> <!-- Fin Rangos -->
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-right:20px">
! 					<table style="border:0px">
! 						<tr align="right">
! 							<td>Country Code</td>
! 						</tr>
! 						<tr align="right">
! 							<td>
! 								<div style="display:inline">
! 									<img src="<!-- TMPL_VAR NAME="themelang" -->/images/more.gif" hspace="0" vspace="0" border="0" style="vertical-align:bottom;cursor:pointer" onclick="addCountryCode();">
! 									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
! 								</div>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 				<td style="padding-left:20px"> 
! 					<table style="border:0px">
! 						<tr>
! 							<td>Page Size</td>
! 						</tr>
! 						<tr>
! 							<td>
! 								<input type="text" name="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->"
! 								       size="10">
! 								<a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a>
! 							</td>
! 						</tr>
! 					</table>
! 				</td>
! 			</tr>
! 			<tr> 
! 				<td align="right" style="padding-left:20px">Text under label</td>
! 				<td>
! 					<input type="text" name="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> If this field is empty, author and title will be used instead
! 				</td>
! 			</tr>
!   			<tr valign="top">
!   			    <td colspan="2" align="center">
! 			    	<table style="width:50%">
! 						<tr style="border-color:#000FCD">
! 							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
! 						</tr>
! 						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
! 							<tr style="align:left">
! 								<!-- TMPL_LOOP NAME="columns" -->
! 									<td style="border:1px solid #000000">
! 										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
! 								<!-- /TMPL_LOOP -->
! 							</tr>
! 						<!-- /TMPL_LOOP -->  			    
! 					</table>
! 				</td>
!   			</tr>
!   			<tr valign="top">
!   			    <td align="right">
! 					<input type="submit" value="Generate Barcodes" name="B1" class="button">
! 				</td>
!   			    <td align="left">
!   			    	<input type="reset" value="Clear Fields" name="B2" class="button">
! 				</td>
!   			</tr>
! 		</table>		
! 	</form>
! </div>
! <!-- TMPL_INCLUDE NAME="barcodes-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan  4 23:32:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 04 Jan 2005 14:32:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/barcodes barcodes.tmpl,NONE,1.1 printerConfig.tmpl,NONE,1.1
Message-ID: <E1ClxE5-00013S-Cn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4015/koha-tmpl/intranet-tmpl/npl/en/barcodes

Added Files:
	barcodes.tmpl printerConfig.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced Search<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- ******************************************************************************************************** -->
<!-- ******                              END OF ADD COUNTRY CODE PANEL                                 ****** -->
<!-- ******************************************************************************************************** -->

<div class="data">
	<h1>Barcodes Generator</h1>
	<ul>
		<li>Select a range of inventary codes. You can choose a continuous range or individual inventory codes</li>
		<li>Select the standard type to generate barcodes.</li>
		<li>Define the page size for output the PDF.</li>
		<li>Depending on page size, Koha will show you how the page is arranged
		    for each barcode. You can define wich point to start printing the page.
		</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1" onsubmit="return checkFields(this);" target="_blank">
		
		<table class="myTable" border="1">
		<caption>Generate barcodes from inventory codes</caption>
			<!-- TMPL_IF NAME="ERROR" -->
			<tr>
				<td colspan="2">
					<p class="error">Can't find inventory codes in that range. Please try again.</p>
				</td>
			</tr>
			<!-- /TMPL_IF -->
  			<tr>
				<td><label for="rangeType">Type of Interval:</label> <!-- TMPL_VAR NAME="RANGE_TYPE" --></td>
				<td> 
					<div id="continuous" class="panel" style="display:inline">
						<table class="ranges">
							<tr>
					   			<td>From:</td> 
								<td><input id="from" type="text" name="from" size="20"></td>
							</tr>
							<tr>
					   			<td>To:</td>
								<td><input id="to" type="text" name="to" size="20"></td>
							</tr>
						</table>
					</div> 
 				    <div id="individuals" class="panel" style="display:none">
						<table class="ranges">
							<tr>
								<td width="5%">
									Inventory Code <BR>
									<input id="inventaryCode" type="text" name="inventaryCode" size="20">
								<td>
								<td>	
									<a href="#" onclick="addItem(); return false;">&lt;&lt;</a><br>
									<a href="#" onclick="removeItem(); return false;">&gt;&gt;</a>
								</td>
								<td width="95%">		   
									<select id="inventaryList" size="5" style="width:150px">
									</select>
									<input type="hidden" id="individualCodes" name="individualCodes">																						
								</td>
							</tr>
						</table>	
					</div>						
				</td> <!-- Fin Rangos -->
			</tr>
			<tr> 
				<td><label for="numbersystem">Country Code:</label> <div style="display:inline">
									<a href="#" onclick="addCountryCode(); return false;">+</a>
									<!-- TMPL_VAR NAME="NUMBER_SYSTEM" -->
									<div class="countryPanel" style="position:absolute" id="addCountryCode">
 	<form action="/cgi-bin/koha/barcodes/barcodes.pl" method="post" style="display:inline">
		<input type="hidden" name="addCode" value="1">
		<table>
			<tr><th colspan="2">Add a new Country Code</th></tr>
			<tr><td><label for="countryName">Country Name:</label></td><td><input type="text" size="10" id="countryName" name="countryName" /></td></tr>
			<tr><td><label for="countryCode">Country Code:</label></td><td><input type="text" size="3" id="countryCode" name="countryCode" /></td></tr>
			<tr>
				<td><input type="submit" name="submit" id="submit" value="Save Code" class="submit" /></td>
	<td><input type="button" name="cancel" id="cancel" value="Cancel" onclick="document.getElementById('addCountryCode').style.display = 'none'" class="cancel" /></td></tr>
		</table>
	</form>
</div>
								</div>
				</td>
				<td><label for="pageType">Page Size</label> <input type="text" name="pageType" id="pageType" readonly value="<!-- TMPL_VAR NAME="PAGES" -->" size="10"> <a href="/cgi-bin/koha/barcodes/printerConfig.pl">[Go to Printer Configuration]</a></td>
			</tr>
			<tr> 
				<td colspan="2"><label for="text_under_label">Text under label: </label>	<input type="text" name="text_under_label" id="text_under_label" size="40" value="<!-- TMPL_VAR name="text_under_label -->"> <p>If this field is empty, author and title will be used instead</p></td>
			</tr></table>

						    	<table style="width:50%">
						<tr>
							<th colspan="<!-- TMPL_VAR NAME="COL_SPAN" -->">Label number to start printing</th>
						</tr>
						<!-- TMPL_LOOP NAME="LABEL_TABLE" -->
							<tr>
								<!-- TMPL_LOOP NAME="columns" -->
									<td style="white-space: nowrap;">
										<input type="radio" id="label" value="<!-- TMPL_VAR NAME="tagname" -->" name="label" <!-- TMPL_VAR NAME="check" -->>  Label  <!-- TMPL_VAR NAME="labelname" --></td>
								<!-- /TMPL_LOOP -->
							</tr>
						<!-- /TMPL_LOOP -->  			    
					</table>
					
<p><input type="submit" value="Generate Barcodes" name="B1" class="submit"></p>
	</form>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcode Generator Printer Configuration<!-- TMPL_INCLUDE NAME="doc-head-barcodes-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

	<h1>Printer Configuration</h1>
	<h3>Set the printer configuration corresponding to your environment</h3>
	<ul>
		<li>Set width and height of the label that you are going to work with.</li>
		<li>Set your system's default DPI.</li>
		<li>Set the page size.</li>
		<li>Select how many columns and rows are in your page size.</li>
		<li>Set the left margin bottom margin the page that you are going to use. This parameters will help to center the barcodes into the labels.</li>
	</ul>

	<form id="formulario" method="POST" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" name="form1">
		<input type="hidden" name="saveSettings" value="1">
		<div class="table"><table border="1" class="myTable">
			<tr>
				<th>Label width (in mm)</th>
				<th>Label height (in mm)</th>
				<th>System DPI</th>
				<th>Page Size</th>
				<th>Columns</th>
				<th>Rows</th>
				<th>Margin Bottom (mm)</th>
				<th>Margin Left (Expressed in mm)</th>
			<tr>
  			<tr>
				<td> <input id="labelWidth" type="text" name="labelWidth" size="5" value="<!-- TMPL_VAR NAME="LABEL_WIDTH" -->"></td>
				<td><input id="labelHeigth" type="text" name="labelHeigth" size="5" value="<!-- TMPL_VAR NAME="LABEL_HEIGTH" -->"></td>
				<td><input id="systemDpi" type="text" name="systemDpi" size="5" value="<!-- TMPL_VAR NAME="SYSTEM_DPI" -->"></td>
				<td><select name="pageType" id="pageType" size="1">
						<!-- TMPL_IF name="A4" -->
							<option value="A4" selected>A4</option>
				        <!-- TMPL_ELSE -->
							<option value="A4">A4</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Letter" -->
							<option value="Letter" selected>Letter</option>
				        <!-- TMPL_ELSE -->
							<option value="Letter">Letter</option>
						<!-- /TMPL_IF -->
						<!-- TMPL_IF name="Legal" -->
							<option value="Legal" selected>Legal</option>
				        <!-- TMPL_ELSE -->
							<option value="Legal">Legal</option>
						<!-- /TMPL_IF -->
		            </select></td>
  			    <td><input id="columns" type="text" name="columns" size="5" value="<!-- TMPL_VAR NAME="COLUMNS" -->"></td>
  			    <td><input id="rows" type="text" name="rows" size="5" value="<!-- TMPL_VAR NAME="ROWS" -->"></td>
  			    <td><input id="marginBottom" type="text" name="marginBottom" size="5" value="<!-- TMPL_VAR NAME="MARGIN_TOP" -->"></td>
  			    <td><input id="marginLeft" type="text" name="marginLeft" size="5" value="<!-- TMPL_VAR NAME="MARGIN_LEFT" -->"></td>
  			</tr></table></div>
<p>		<input type="submit" value="Save Settings" class="submit"></p>
	</form>

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:31:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:31:20 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.22,1.23 Install.pm,1.87,1.88 koha.upgrade,1.16,1.17
Message-ID: <E1CmCC0-00074e-Ff@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147/misc

Modified Files:
	buildrelease Install.pm koha.upgrade 
Log Message:
minor update just before releasing official 2.2.0

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** buildrelease	16 Nov 2004 13:04:18 -0000	1.22
--- buildrelease	5 Jan 2005 14:31:06 -0000	1.23
***************
*** 219,223 ****
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! system("cvs update -P");
  if ($cvstag) {
      print qq|
--- 219,223 ----
  |;
  chdir($kohadir) || die "$kohadir: $!\n";
! # system("cvs update -P");
  if ($cvstag) {
      print qq|

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -r1.87 -r1.88
*** Install.pm	3 Jan 2005 11:11:10 -0000	1.87
--- Install.pm	5 Jan 2005 14:31:17 -0000	1.88
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 149,153 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 1819,1823 ****
  such as DANMARC.  We would like to hear from you if you do.
  
! UPGRADE : If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
--- 1819,1824 ----
  such as DANMARC.  We would like to hear from you if you do.
  
! *** UPGRADE ***
! If you UPGRADE your version from a previous 2.x.x, the right choice here is N (None) to preserve your local MARC setup.
  
  Choose MARC definition [1]: |;
***************
*** 1827,1833 ****
  
    en : default language, all pages available
!   fr : complete translation (except pictures)
!   es : partial librarian site translation (including pictures)
!   pl : complete OPAC and partial librarian translation
    zh_TW : partial translation
  
--- 1828,1833 ----
  
    en : default language, all pages available
!   fr : complete translation
!   es : partial librarian site translation
    zh_TW : partial translation
  

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** koha.upgrade	23 Nov 2004 16:02:33 -0000	1.16
--- koha.upgrade	5 Jan 2005 14:31:17 -0000	1.17
***************
*** 15,34 ****
  loadconfigfile();
  
! my $kohaversion=`cat koha.version`;
! chomp $kohaversion;
! Install::setkohaversion $kohaversion;
  
  
! if ($kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
! 
! unless ($answer =~/y/i) {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
- } else {
- 	print "Great! continuing upgrade... \n";
  };
  
--- 15,33 ----
  loadconfigfile();
  
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! Install::setkohaversion $::newversion;
  
  
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
  
! my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
! if ($answer eq "Y" || $answer eq "y") {
! 	print "Great! continuing upgrade... \n";
! } else {
  	showmessage(getmessage('AbortingInstall'),'none');
  	exit;
  };
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/authorities searchresultlist.tmpl,1.7,1.8
Message-ID: <E1CmCDA-00078D-7s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27401/koha-tmpl/intranet-tmpl/default/en/authorities

Modified Files:
	searchresultlist.tmpl 
Log Message:


Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** searchresultlist.tmpl	2 Dec 2004 16:41:07 -0000	1.7
--- searchresultlist.tmpl	5 Jan 2005 14:32:30 -0000	1.8
***************
*** 43,47 ****
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist='<!-- TMPL_VAR NAME="biblio_fields" -->'&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
--- 43,47 ----
  				<tr>
  					<td><!-- TMPL_VAR NAME="summary" --></td>
! 					<td><a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=and&amp;excluding=" class="button authority"><!-- TMPL_VAR NAME="used" --> biblio(s)</a></td>
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">




From tipaul at users.sourceforge.net  Wed Jan  5 15:32:59 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:32:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en about.tmpl,1.11,1.12
Message-ID: <E1CmCDb-00079k-Ae@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27471/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	about.tmpl 
Log Message:
updated credits for 2.2 release

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** about.tmpl	19 Jul 2004 21:41:29 -0000	1.11
--- about.tmpl	5 Jan 2005 14:32:56 -0000	1.12
***************
*** 3,98 ****
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
- 	
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Koha version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>OS version (from 'uname -a'):</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Perl version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>MySQL version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Apache version:</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Credits</td>
! 			<td>
! 				<h2>Core team</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>, Kaitiaki<br/>
! 							<b>Paul Poulain</b>, 2.2 release manager (MARC developper)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco, (Documentation Compiler)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, French Translation<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							<b>Horowhenua Library Trust</b> : Rosalie Blake, Head of Libraries<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Thanks to</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polish for 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri-Damien Laurent<br/>
! 							J?rome Vizcaino (Esiee School)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee School)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Esiee School)<br/>
! 							Pawel Skuza (Polish for 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 3,72 ----
  <div id="mainbloc">
  	<!-- TMPL_VAR NAME="about" -->
  	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<div id="bloc25">
! 		<h2>Server information</h2>
! 		<p><label class="label100">Koha version</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">OS version ('uname -a')</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">Perl version</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">MySQL version</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Special thanks to the following funders</h2>
! 		<p><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
! 		<p>The <b>Nelsonville Public Library</b> (MARC support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>ENSMP (Ecole Nationale Sup?rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Core team for 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</p>
! 		<p>Stephen Hedges &amp; the <b>Nelsonville Public Library</b> (MARC features funders)</p>
! 		<p>Nicholas Rosasco, (Documentation Compiler)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Thanks to</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) OPAC basket</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee School</b> (J?rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri-Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin (French Translation in 2.0)</p>
! 					<p>Pawel Skuza (Polish for 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:33:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:33:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr about.tmpl,1.3,1.4 auth.tmpl,1.3,1.4 bookcount.tmpl,1.3,1.4 boraccount.tmpl,1.6,1.7 charges.tmpl,1.3,1.4 intranet-main.tmpl,1.8,1.9 modbibitem.tmpl,1.3,1.4 moditem.tmpl,1.3,1.4 overdue.tmpl,1.3,1.4 reports.tmpl,1.3,1.4 request.tmpl,1.7,1.8 shelves.tmpl,1.3,1.4 thesaurus_popup.tmpl,1.5,1.6
Message-ID: <E1CmCE1-0007CD-3y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27604/koha-tmpl/intranet-tmpl/default/fr

Modified Files:
	about.tmpl auth.tmpl bookcount.tmpl boraccount.tmpl 
	charges.tmpl intranet-main.tmpl modbibitem.tmpl moditem.tmpl 
	overdue.tmpl reports.tmpl request.tmpl shelves.tmpl 
	thesaurus_popup.tmpl 
Log Message:
french version for 2.2.0

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/about.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** about.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- about.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 2,96 ****
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" -->   <h1>Data about the current version of Koha for bug reports (or general interest).</h1>
! 	<table align="center">
! 		<tr>
! 			<td width="25%">Version Koha</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version de l'OS (depuis 'uname -a) :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>version PERL :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version MySQL</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Version Apache :</td>
! 			<td><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></td>
! 		</tr>
! 		<tr>
! 			<td>Cr?dits</td>
! 			<td>
! 				<h2>Contributeurs principaux</h2>
! 				<table>
! 					<tr>
! 						<td width="50%">
! 							<b>Pat Eyler</b>,Kaitiaki<br/>
! 							<b>Paul Poulain</b>, responsable de la version 2.2 (d?veloppeur MARC)<br/>
! 							Joshua Ferraro &amp; the <b>Nelsonville Public Library</b> (MARC features funders)<br/>
! 							<b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)<br/>
! 							Nicholas Rosasco,(r?dacteur de la documentation)<br/>
! 							Mike Hansen<br/>
! 							MJ Ray and <b>Turo Technology LLP</b>, England (quality control, installer &amp; updater, 2.0 release maintainer)<br/>
! 							Nicolas Morin, traduction fran?aise<br/>
! 						</td>
! 						<td width="50%" valign="top">
! 							 <b>Groupement de biblioth?ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth?ques<br/>
! 							Jo Ransom<br/>
! 							<b>Katipo Communications</b> : Rachel Hamilton-Williams, General Manager (Webmistress),
! 							Chris Cormack, 1.2 release manager
! 							and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 							Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine<br/>
! 						</td>
! 					</tr>
! 				</table>
! 				<h2>Merci ?</h2>
! 				<table width="100">
! 					<tr>
! 						<td width="33%">
! 							Adam Thick<br/>
! 							Andrew Hooper<br/>
! 							Al Banks<br/>
! 							Ambrose Li<br/>
! 							Andrew Arensburger<br/>
! 							Benedykt P. Barszcz (Polonais pour version 2.0)<br/>
! 							Brig C. McCoy<br/>
! 							Daniel Holth<br/>
! 							David Strainchamps<br/>
! 							Dorian Meid<br/>
! 						</td>
! 						<td width="33%">
! 							Ed Summers<br/>
! 							Florian Bischof<br/>
! 							Francisco M. Marzoa Alonso<br/>
! 							Glen Stewart<br/>
! 							Henri Damien Laurent<br/>
! 							J?rome Vizcaino (Esiee Paris)<br/>
! 							Kip DeGraaf<br/>
! 							Marco Gaiarin<br/>
! 							Md. Aftabuddin<br/>
! 							Michaes Herman<br/>
! 						</td>
! 						<td width="33%">
! 							Michel Lerenard (Esiee)<br/>
! 							Mike Johnson<br/>
! 							Mike Mylonas<br/>
! 							Pierre Cauchois (Ecole Esiee)<br/>
! 							Pawel Skuza (Polonais pour la version 1.2)<br/>
! 							Regula Sebastiao<br/>
! 							Roger Buck<br/>
! 							Ron Wickersham<br/>
! 							Sebastiaan Durand<br/>
! 						</td>
! 					</tr>
! 				</table>
! 			</td>
! 		</tr>
! 	</table>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->
--- 2,71 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_VAR NAME="about" --> <h1>Informations sur la version actuelle de Koha pour le rapport de bogues (ou d'int?r?t g?n?ral).</h1>  \t 
! 	<div id="bloc25">
! 		<h2>Information serveur</h2>
! 		<p><label class="label100">Version Koha</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
! 		<p><label class="label100">Version de l'OS ('uname -a) :</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
! 		<p><label class="label100">version PERL :</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
! 		<p><label class="label100">Version MySQL</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
! 		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Un merci particulier aux financeurs suivants</h2>
! 		<p><b>Groupement de biblioth?ques de Horowhenua</b> : Rosalie Blake, directrice des biblioth?ques (Koha 1.0)</p>
! 		<p>La <b>Biblioth?que Publique de Nelsonville</b> (support MARC)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</p>
! 		<p><b>EMN (Ecole des Mines de Nantes)</b> (modules suggestion et stats, support ldap am?lior?)</p>
! 	</div>
! 	<div id="bloc25">
! 		<h2>Contributeurs principaux pour la version 2.2</h2>
! 		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
! 		<p><b>Paul Poulain</b>, responsable de la version 2.2 (d?veloppeur MARC)</p>
! 		<p>Stephen Hedges et La <b>Biblioth?que Publique de Nelsonville</b> (Financement du codage MARC)</p>
! 		<p>Nicholas Rosasco,(r?dacteur de la documentation)</p>
! 		<p>Mike Hansen</p>
! 		<p>MJ Ray et <b>Turo Technology LLP</b>, (contr?le qualit?, installation et mise ? jour, maintenance de la version 2.0)</p>
! 		<p><b>Katipo Communications</b></p>
! 		<ul>
! 			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
! 			<p>Chris Cormack, 1.2 release manager</p>
! 			<p>et Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
! 			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
! 		</ul>
! 	</div>
! 	<div id="bloc25">
! 	<h2>Merci ?</h2>
! 					<p>Adam Thick</p>
! 					<p>Andrew Hooper</p>
! 					<p>Al Banks</p>
! 					<p>Ambrose Li (chinese & translation tool)</p>
! 					<p>Andrew Arensburger (the small & great C4::Context module)</p>
! 					<p>Benedykt P. Barszcz (Polonais pour version 2.0)</p>
! 					<p>Brig C. McCoy</p>
! 					<p>Daniel Holth</p>
! 					<p>David Strainchamps</p>
! 					<p>Dorian Meid (German translation)</p>
! 					<p><b>doXulting</b> (Matthieu Branlat) panier OPAC</p>
! 					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
! 					<p><b>Esiee</b> (J?rome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
! 					<p>Florian Bischof</p>
! 					<p>Francisco M. Marzoa Alonso</p>
! 					<p>Glen Stewart</p>
! 					<p>Henri Damien Laurent</p>
! 					<p>Jo Ransom</p>
! 					<p>Kip DeGraaf</p>
! 					<p>Marco Gaiarin</p>
! 					<p>Md. Aftabuddin</p>
! 					<p>Michaes Herman</p>
! 					<p>Mike Johnson</p>
! 					<p>Mike Mylonas</p>
! 					<p>Nicolas Morin, (traduction fran?aise 2.0)</p>
! 					<p>Pawel Skuza (Polonais pour la version 1.2)</p>
! 					<p>Regula Sebastiao</p>
! 					<p>Roger Buck</p>
! 					<p>Ron Wickersham</p>
! 					<p>Sebastiaan Durand</p>
! 					<p><b>Steve Tonnesen</b> (pr?paration MARC, conception des Etag?res virtuelles, KohaCD)</p>
! 	</div>
  </div>
  <!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/auth.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** auth.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- auth.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 18,22 ****
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2> Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r?essayer.</h2>
  <!-- /TMPL_IF -->
  
--- 18,22 ----
  <!-- TMPL_IF NAME="invalid_username_or_password" -->
  <!-- This is what is displayed if the username or password doesn't work -->
! <h2>Vous avez saisi un nom d'utilisateur ou un mot de passe invalide. Merci de r?essayer.</h2>
  <!-- /TMPL_IF -->
  

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookcount.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** bookcount.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- bookcount.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE BARRE <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
--- 5,9 ----
  	<tr valign="top">
  		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
! 			<b>CODE A BARRES <!-- TMPL_VAR NAME="barcode" --></b>
  		</td>
  	</tr>
***************
*** 11,15 ****
  		<td width="440">
  
! 		</b> <!-- TMPL_VAR NAME="homebranch" -->'><b>Site d'origine: </b>  <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv?e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
--- 11,15 ----
  		<td width="440">
  
! 		<b>Site d'origine: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
  		<b>Site Actuel: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
  		<b>Date d'arriv?e au site actuel: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>

Index: boraccount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** boraccount.tmpl	24 Nov 2004 16:22:25 -0000	1.6
--- boraccount.tmpl	5 Jan 2005 14:33:21 -0000	1.7
***************
*** 3,7 ****
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour</h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr?er une facture manuelle</a>
  <center>
--- 3,7 ----
  <!-- The manual invoice and credit buttons -->
  
! <h1>Compte pour <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
  <a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Cr?er une facture manuelle</a>
  <center>

Index: charges.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/charges.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** charges.tmpl	24 Nov 2004 16:22:25 -0000	1.3
--- charges.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 4,9 ****
  
  <p>
! Each box needs to be filled in with fine,time to start charging,charging cycle<br>
!  par exemple 1,7,7 signifie 1EUR d'amende, apr?s 7 jours, tous les 7 jours.<p>
  
  <table>
--- 4,9 ----
  
  <p>
! Chaque cellule doit ?tre remplie avec l'amende, l'?ch?ance et la dur?e des charges<br>
! par exemple 1,7,7 signifie 1EUR d'amende, apr?s 7 jours, tous les 7 jours.<p>
  
  <table>

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/intranet-main.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** intranet-main.tmpl	24 Nov 2004 16:22:25 -0000	1.8
--- intranet-main.tmpl	5 Jan 2005 14:33:21 -0000	1.9
***************
*** 74,78 ****
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Search a biblio. When this biblio is found, you can check its status, reserve it, or see where it is</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth?que</p>
--- 74,78 ----
  			<h1 class="catalogue">Catalogue</h1>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&amp;type=intranet" class="catalogue">Recherche catalogue</a>
! 				<p>Rechercher une notice.Quand ce document est trouv?, vous pouvez v?rifier son ?tat, faire une r?servation, ou bien voir o? il se trouve</p>
  			<a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet" class="catalogue">Ajouter une notice</a>
  				<p>Ajouter directement une notice au catalogue de la biblioth?que</p>
***************
*** 80,86 ****
  				<p>Gestion des abonnements et des p?riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag?res Virtuelles</a>
! 				<p>Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one.
! 				The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic.
! 				It can be used by a library to define "most valuable books for &lt;some category of patron&gt;"</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
--- 80,84 ----
  				<p>Gestion des abonnements et des p?riodiques</p>
  			<a href="/cgi-bin/koha/bookshelves/shelves.pl" class="catalogue">Etag?res Virtuelles</a>
! 				<p>Les ?tag?res virtuelles peuvent ?tre utilis?es par des biblioth?caires ou des usagers pour constituer des biblioth?ques virtuelles au sein de la vraie. L'?tag?re virtuelle peut ?tre utilis? par un enseignant pour aider ses ?l?ves dans la recherche d'information sur un sujet particulier.On peut l'utiliser  dans une biblioth?que pour indiquer des listes de documents (les plus emprunt?s, les plus repr?sentatifs...).</p>
  			<!-- TMPL_IF NAME="NOTMARC" -->
  				<form action="/cgi-bin/koha/loadmodules.pl" method="post">
***************
*** 107,122 ****
  			<p>Aller ? la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Add a member in the library. The member can be attached to any branch of the library. He or she can also have children.</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit?</a>
! 			<p>Add an organisation in the library. This member doesn't have some information a "physical" member has.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Lignes de Commande, recevoir des commandes, ?tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Rapports</h1>
! 			Tous les rapports syst?me
  		</div>
  		<div id="Hint5" class="hint">
--- 105,120 ----
  			<p>Aller ? la page principale des lecteurs</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add" class="members">Ajouter une inscription</a>
! 			<p>Ajouter un lecteur ? la biblioth?que.Le lecteur peut-?tre rattach?  ? n'importe quel site de la biblioth?que.Il ou elle peut aussi avoir des enfants</p>
  			<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&actionType=Add" class="members">Ajouter une collectivit?</a>
! 			<p>Ajouter une collectivit? ? la biblioth?que.Cette inscription ne peut contenir les m?mes informations que pour une personne physique.</p>
  		</div>
  		
  		<div id="Hint3" class="hint">
  			<h1 class="acquisition">Acquisitions</h1>
! 			Commander des documents, recevoir des commandes, ?tablir des budgets...
  		</div>
  		<div id="Hint4" class="hint">
! 			<h1 class="reports">Bilans</h1>
! 			Tous les bilans du syst?me
  		</div>
  		<div id="Hint5" class="hint">
***************
*** 126,136 ****
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param?tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G?n?rateur de code-barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Fonds de livres</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r?servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr?t</h1>
! 			Work at the front desk on Issues and returns using only a barcode reader and a mouse
  		</div>
  <!-- MAIN MENU -->
--- 124,134 ----
  		<div id="Hint6" class="hint">
  			<h1 class="parameters">Param?tres</h1>
! 			<h2 class="parameters"><a href="barcodes/barcodes.pl">G?n?rateur de code ? barres</a></h2>
! 			<h2 class="parameters"><a href="admin/aqbookfund.pl">Lignes de cr?dit</a></h2>
  			<h2 class="parameters"><a href="import/breeding.pl">Importer dans le r?servoir</a></h2>
  		</div>
  		<div id="Hint7" class="hint">
  			<h1 class="circulation">Pr?t</h1>
! 			A la banque de pr?t, effectuez les pr?ts et les retours, en utilisant uniquement un lecteur de code barre et une souris
  		</div>
  <!-- MAIN MENU -->
***************
*** 145,149 ****
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit?s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Rapports</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param?tres</a><br/>
--- 143,147 ----
  		<a href="/cgi-bin/koha/authorities/authorities-home.pl" class="reports" onMouseOver="SetOn(5);">Autorit?s</a><br/>
  		
! 		<a href="/cgi-bin/koha/reports-home.pl" class="reports" onMouseOver="SetOn(4);">Bilans</a><br/>
  		
  		<a href="/cgi-bin/koha/admin-home.pl" class="parameters" onMouseOver="SetOn(6);">Param?tres</a><br/>

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/modbibitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** modbibitem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- modbibitem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 36,40 ****
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Localisation</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
--- 36,40 ----
  
  		<tr valign="top" bgcolor="white"><td>Editeur</td><td><input type="text" name="Publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="20"></td></tr>
! 		<tr valign="top" bgcolor="white"><td>Emplacement</td><td><input type="text" name="Place" value="<!-- TMPL_VAR NAME="place" -->" size="20"></td></tr>
  
  
***************
*** 68,78 ****
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES BARRES<br>
! 			Tick ALL barcodes that changes are to apply too. Those left un-ticked will keep the original group record.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code Barre</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
--- 68,78 ----
  
  		<tr valign="top"  bgcolor="#99cc33">
! 			<td  bgcolor="#99cc33" background="/images/background-mem.gif" colspan="5" ><b>LES MODIFICATIONS VONT AFFECTER CES CODES A BARRES<br>
! 			Pointez TOUS les codes-barres auquels les changements s'appliquent.</td>
  		</tr>
  
  		<tr valign="top" bgcolor="#99CC33">
  			<td background="/images/background-mem.gif">&nbsp;</td>
! 			<td background="/images/background-mem.gif">Code ? Barres</td>
  			<td background="/images/background-mem.gif">Localisation</td>
  			<td background="/images/background-mem.gif">Date de retour</td>
***************
*** 99,104 ****
  
  
! <b>HELP:</b> You <b>must</b> click on the appropriate radio button (in the green boxes), and choose to either re-assign the item/s to a record already in the system, or modify this record.  IF your changes only apply to some
!  items, tick the appropriate ones and a new group record will be created automatically for them.
   <br clear="all">
   <p> &nbsp; </p>
--- 99,103 ----
  
  
! <b>AIDE:</b>Vous<b>devez</b>cliquer sur le bouton ad?quat (dans les pav?s verts), et choisir soit de d?placer le(s) exemplaire(s)vers un enregistrement d?j? existant dans la base, soit de modifier cet enregistrement. Si vos modifications ne concernent que quelques exemplaires, pointer ceux qui sont concern?s et une nouvelle notice sera cr??e automatiquement pour eux.
   <br clear="all">
   <p> &nbsp; </p>

Index: moditem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/moditem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** moditem.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- moditem.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 5,9 ****
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code Barre</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">
--- 5,9 ----
  <tr valign="top" bgcolor="white"><td><form action=updateitem.pl method="post">
  <table border="0" cellspacing="0" cellpadding="5">
! <tr valign="top" bgcolor="white"><td>Code ? Barres</td><td><input type="text" name="Barcode" value="<!-- TMPL_VAR NAME="barcode" -->" size="40"></td></tr>
  <input type="hidden" name="Class" value="<!-- TMPL_VAR NAME="classification" -->">
  <input type="hidden" name="Publisher" value="<!-- TMPL_VAR NAME="publisher" -->">

Index: overdue.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/overdue.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** overdue.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- overdue.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 6,10 ****
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Usager</th>
  		<th class="reports">T?l?phone</th>
  		<th class="reports">Titre</th>
--- 6,10 ----
  	<tr>
  		<th class="reports">Date de retour</th>
! 		<th class="reports">Emprunteur</th>
  		<th class="reports">T?l?phone</th>
  		<th class="reports">Titre</th>

Index: reports.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** reports.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- reports.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> rapports </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="issues-top.inc" -->
  
! <h1> <!-- TMPL_VAR NAME="type" --> bilans </h1>
  
  <!-- TMPL_LOOP Name="dataloop" -->

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/request.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** request.tmpl	24 Nov 2004 16:22:26 -0000	1.7
--- request.tmpl	5 Jan 2005 14:33:21 -0000	1.8
***************
*** 103,107 ****
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>
--- 103,107 ----
  						</td>
  						<td>
! 						<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
  						</td>
  						<td><!-- TMPL_VAR NAME="notes" --></td>

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/shelves.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** shelves.tmpl	24 Nov 2004 16:22:26 -0000	1.3
--- shelves.tmpl	5 Jan 2005 14:33:21 -0000	1.4
***************
*** 32,36 ****
  		<tr>
  			<td>
! 				ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>
--- 32,36 ----
  		<tr>
  			<td>
! 				Ajouter un livre par code ? barre dans <!-- TMPL_VAR NAME="shelfname" -->:
  			</td>
  			<td>

Index: thesaurus_popup.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/thesaurus_popup.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** thesaurus_popup.tmpl	24 Nov 2004 16:22:26 -0000	1.5
--- thesaurus_popup.tmpl	5 Jan 2005 14:33:21 -0000	1.6
***************
*** 33,37 ****
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit?
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 33,37 ----
  	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit?: <input type="text" name="insert">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:34:36 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:34:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint - New directory
Message-ID: <E1CmCFA-0007H7-LO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27952/koha-tmpl/intranet-tmpl/default/fr/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:23 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/maint catmaintain.tmpl,NONE,1.1
Message-ID: <E1CmCFv-0007Me-B8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/maint

Added Files:
	catmaintain.tmpl 
Log Message:
french version for 2.2.0

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="cat-top.inc" -->


<!-- TMPL_IF NAME=allsub-p -->
<!-- TMPL_LOOP NAME="loop" -->
"<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
Sujet:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
<input type="hidden" name="type" value="upsub">
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
<input type="submit" value="modifier">
</form>
<p>Cela changera la vedette-sujet dans toutes les notices o? ce sujet est utilis?.
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Modification r?ussie <!-- TMPL_VAR NAME="oldsub" escape=html --> est maintenant <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table border="0">
<thead>
<tr><th>Titre</th><th>Auteur</th><th>Reprendre</th></tr>
<tbody>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Reprendre</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
Annulation de suppression r?ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour ? la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
<input type="hidden" name="type" value="updatetype">
Type de document : <input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
<input type="submit" value="Changer">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
Mise ? jour r?ussie
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Retour ? la Maintenance du Catalogue</a>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<b>Maintenance des Sujets</b><br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="allsub">
Voir tous les sujets commen?ant par <input type="text" name="sub"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Maintenance des groupes</b></br>
<form action="/cgi-bin/koha/search.pl" method="post">
<input type="hidden" name="type" value="catmain">
Voir tous les Titres commen?ant par <input type="text" name="title"><br>
Num?ro de l'exemplaire <input type="text" size="25" name="item"><br>
<input type="submit" value="Voir">
</form>
<p>
<b>Reprendre Notice</b></br>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<input type="hidden" name="type" value="undel">
Voir tous les Titres commen?ant par <input type="text" name="title"><br>
<input type="submit" value="Voir">
</form>
<!-- /TMPL_IF -->


<!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/user userpage.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007NK-49@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/user

Modified Files:
	userpage.tmpl 
Log Message:
french version for 2.2.0

Index: userpage.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/user/userpage.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** userpage.tmpl	24 Nov 2004 16:21:16 -0000	1.3
--- userpage.tmpl	5 Jan 2005 14:35:22 -0000	1.4
***************
*** 19,23 ****
  	</ul>
  	<p>
! 	<b>Vous avez reserv? les ouvrages en pr?t suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
--- 19,23 ----
  	</ul>
  	<p>
! 	<b>Vous avez r?serv? les documents suivants :</b>
  	<ul>
  	<li>The Amazing Apple Book by Paulette Bourgeois
***************
*** 56,60 ****
  			<input name="overduesbyemail" type="checkbox" checked> Pr?venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox">  Autoriser l'?quipe de la biblioth?que ? consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>
--- 56,60 ----
  			<input name="overduesbyemail" type="checkbox" checked> Pr?venez moi de retards par messagerie (e-mail)<br>
  			<input name="recordreadingrecord" type="checkbox"> Garder un enregistrement des livres que j'ai lu<br>
! 			<input name="recordreadingrecord" type="checkbox"> Autoriser l'?quipe de la biblioth?que ? consulter la liste de mes emprunts<br>
  			</td></tr>
  			<tr><td align=center colspan=2>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/search.marc result.tmpl,1.5,1.6 search.tmpl,1.6,1.7
Message-ID: <E1CmCFx-0007NH-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/search.marc

Modified Files:
	result.tmpl search.tmpl 
Log Message:
french version for 2.2.0

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/result.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** result.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- result.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 7,39 ****
  	<h1 class="catalogue">R?sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
! 					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
! 				</a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 					<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
! 		<p>
! 			<!-- TMPL_IF NAME="total" -->
! 			&nbsp;<b>R?ponses <!-- TMPL_VAR NAME="from" --> ?  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --></b><br><br>
! 			<!-- TMPL_ELSE -->
! 			Pas de r?ponse<br>
! 			<!-- /TMPL_IF -->
! 		</p>
! 	</div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">Abr?g?</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
--- 7,17 ----
  	<h1 class="catalogue">R?sultats de recherche</h1>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr?c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
! 		<p class="resultcount"><!-- TMPL_IF NAME="total" -->R?ponses <!-- TMPL_VAR NAME="from" --> ?  <!-- TMPL_VAR NAME="to" --> sur <!-- TMPL_VAR NAME="total" --><!-- TMPL_ELSE -->Pas de r?ponse<!-- /TMPL_IF --></p></div>
  	<div id="resultlist">
  		<table>
  			<tr>
! 				<th class="catalogue">R?sum?</th>
  				<th class="catalogue">Nombre d'exemplaires</th>
  				<th class="catalogue">Localisation</th>
***************
*** 42,54 ****
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 					<p>
! 						<p>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
  							<!-- TMPL_ELSE -->
! 								<b><a class="transparent" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b>
! 							<!-- /TMPL_IF -->
! 						</p>
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
--- 20,28 ----
  			<!-- TMPL_LOOP NAME="result" -->
  			<tr>
! 				<td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
  							<!-- TMPL_IF name="MARC_ON" -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
  							<!-- TMPL_ELSE -->
! 								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>				<!-- /TMPL_IF -->
  						<p><!-- TMPL_VAR NAME="author" -->
  						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
***************
*** 88,106 ****
  	</div>
  	<div id="resultnumber">
! 		<p>
! 			<!-- TMPL_IF NAME="displayprev" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME="highlight" -->
! 				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
! 				<!-- TMPL_ELSE -->
! 				<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 			<!-- /TMPL_LOOP -->
! 			<!-- TMPL_IF NAME="displaynext" -->
! 			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
! 				<!-- /TMPL_IF -->
! 		</p>
  	</div>	
  </div>
--- 62,67 ----
  	</div>
  	<div id="resultnumber">
! 		<p><!-- TMPL_IF NAME="displayprev" --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt; Pr?c.</a><!-- /TMPL_IF -->
! 			<!-- TMPL_LOOP NAME="numbers" --><!-- TMPL_IF NAME="highlight" --> <span class="highlight"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE --> <a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a><!-- /TMPL_IF --><!-- /TMPL_LOOP --> <!-- TMPL_IF NAME="displaynext" --><a class="resultnumber" href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">Suivant &gt;&gt;</a><!-- /TMPL_IF --></p>
  	</div>	
  </div>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	24 Nov 2004 16:19:00 -0000	1.6
--- search.tmpl	5 Jan 2005 14:35:22 -0000	1.7
***************
*** 8,100 ****
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search" />
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! 			<label class="label100">Ajouter un mot</label>
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Auteur</label> <input type="hidden" name="marclist" value="biblio.author" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" name="value" onchange="sql_update()" size="35" />
! 		</p>
! 		<p>
! 			<label class="label100">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100">Code Barre de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /> 
! 		</p>
! 		<p>
! 			<label class="label100">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="=" />
! 			<input type="text" name="value" onchange="sql_update()" />
! 		</p>
! 		<p>
! 			<label class="label100">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" />
  		</p>
  	</div>
--- 8,100 ----
  <h1 class="catalogue">Recherche Catalogue</h1>
  
! <form name="f" method="post" action="/cgi-bin/koha/search.marc/search.pl">
  	<input type="hidden" name="op" value="do_search">
  	<input type="hidden" name="type" value="intranet">
  	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div class="bloc25">
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<input type="hidden" name="op" value="do_search">
! 			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 			<label class="label100" for="keyword">Tous les mots</label>
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="keyword" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="title">Titre</label>
! 			<input type="hidden" name="marclist" value="biblio.title">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="title" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="author">Auteur</label> <input type="hidden" name="marclist" value="biblio.author">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="author" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="subject">Sujet</label>
! 			<input type="hidden" name="marclist" value="bibliosubject.subject">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">  
! 			<input type="text" name="value" id="subject" onchange="sql_update()" size="35">
! 		</p>
! 		<p>
! 			<label class="label100" for="itemtype">Type de document</label>
! 			<input type="hidden" name="marclist" value="biblioitems.itemtype">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 				<label class="label100" for="branch">Site</label>
! 				<input type="hidden" name="marclist" value="items.holdingbranch">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="=">  
  				<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="catalogue">Autres options</h2>
  		<p>
! 				<label class="label100" for="barcode">Code ? Barres de l'exemplaire</label>
! 				<input type="hidden" name="marclist" value="items.barcode">
! 				<input type="hidden" name="and_or" value="and">
! 				<input type="hidden" name="excluding" value="">
! 				<input type="hidden" name="operator" value="contains">
! 				<input type="text" name="value" id="barcode" onchange="sql_update()"> 
! 		</p>
! 		<p>
! 			<label class="label100" for="callno">Cote</label>
! 			<input type="hidden" name="marclist" value="items.itemcallnumber">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="start">
! 			<input type="text" name="value" id="callno" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="isbn">ISBN</label>
! 			<input type="hidden" name="marclist" value="biblioitems.isbn">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="=">
! 			<input type="text" name="value" id="isbn" onchange="sql_update()">
! 		</p>
! 		<p>
! 			<label class="label100" for="publisher">Editeur</label>
! 			<input type="hidden" name="marclist" value="biblioitems.publishercode">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 			<input type="text" name="value" id="publisher" onchange="sql_update()">
  		</p>
  	</div>
***************
*** 125,139 ****
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button catalogue" value="Ajouter un crit?re" onclick="AddStatement()" class="button catalogue">
! 		Warning : the "contains" statement does NOT work if you enter 2 or less letters
  	</div>
! 	<div id="bloc25">
! 		<p>
! 			<div name="sql">
! 				<textarea name="sql" rows="3" cols="70" disabled readonly></textarea>
! 			</div>
! 		</p>
  		<p>R?sultats par page :
! 			<select align="right" name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
--- 125,135 ----
  		<!-- /TMPL_LOOP -->
  		<p>
! 		<input type="button" value="Ajouter un crit?re" onclick="AddStatement()" class="button catalogue">
! 		Attention : l'option "contient" NE FONCTIONNE PAS si vous n'indiquez pas au moins 3 caract?res.</p>
  	</div>
! 	<div class="bloc25">
! 		<p><textarea name="sql" rows="3" cols="70" disabled readonly></textarea></p>
  		<p>R?sultats par page :
! 			<select name="resultsperpage" size="1">
  				<option value="20">20</option>
  				<option value="50">50</option>
***************
*** 151,155 ****
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a>
  		</p>
  	</div>
--- 147,151 ----
  		<p>
  			<input type="submit" value="Lancer la recherche" class="button catalogue">
! 			<a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
  		</p>
  	</div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/suggestion acceptorreject.tmpl,1.1,1.2 mail_suggestion_ACCEPTED.tmpl,1.1,1.2 mail_suggestion_AVAILABLE.tmpl,1.1,1.2 mail_suggestion_ORDERED.tmpl,1.1,1.2 mail_suggestion_REJECTED.tmpl,1.1,1.2
Message-ID: <E1CmCFx-0007NZ-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/suggestion

Modified Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
french version for 2.2.0

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- acceptorreject.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 24,28 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann?e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
--- 24,28 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann?e de copyright <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->

Index: mail_suggestion_ACCEPTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ACCEPTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ACCEPTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ACCEPTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF --><!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a examin? votre suggestion aujourd'hui, et l'a trouv?e int?ressante. Le document sera achet? d?s que possible. Vous serez alert? par messagerie lorsque l'acquisition sera r?alis?e, puis avertis par messagerie ? nouveau lorsque le document sera ? la biblioth?que. Pour toute question, adressez- vous ? <!-- TMPL_VAR name="libemail" -->. Merci, <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_AVAILABLE.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_AVAILABLE.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_AVAILABLE.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_AVAILABLE.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the item is now part of the collection of the Nelsonville Public Library.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. Nous sommes heureux de vous annoncer que le *** est maintenant dans la la biblioth?que. Si vous avez une question, n'h?sitez pas ? nous ?crire ? <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_ORDERED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_ORDERED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_ORDERED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_ORDERED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.  You will be notified again when the book is available.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->Nous avons le plaisir de vous informer que le livre a ?t? command?.Il devrait arriver bient?t ? la biblioth?que.Nous vous enverrons un autre mail quand le livre sera disponible. Pour toute question, envoyez nous un message ?lectronique ? <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file

Index: mail_suggestion_REJECTED.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/suggestion/mail_suggestion_REJECTED.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mail_suggestion_REJECTED.tmpl	24 Nov 2004 16:20:05 -0000	1.1
--- mail_suggestion_REJECTED.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 1 ****
!  Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.  <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.  If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.  Thank you,  <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file
--- 1 ----
! Cher lecteur <!-- TMPL_VAR NAME="LibraryName" -->, vous avez fait ? la biblioth?que la suggestion d'achat de <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> par <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->. <!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> a trait? votre demande aujourd'hui et a d?cid? de ne pas accepter votre suggestion. Si vous une question, n'h?sitez pas ? nous ?crire ? <!-- TMPL_VAR name="libemail" -->. Merci <!-- TMPL_VAR NAME="LibraryName" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/reports inventory.tmpl,1.2,1.3 issues_by_borrower_category.tmpl,1.1,1.2 itemtypes.tmpl,1.1,1.2 reports-home.tmpl,1.5,1.6
Message-ID: <E1CmCFx-0007NP-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/reports

Modified Files:
	inventory.tmpl issues_by_borrower_category.tmpl itemtypes.tmpl 
	reports-home.tmpl 
Log Message:
french version for 2.2.0

Index: inventory.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/inventory.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** inventory.tmpl	24 Nov 2004 16:19:00 -0000	1.2
--- inventory.tmpl	5 Jan 2005 14:35:22 -0000	1.3
***************
*** 5,14 ****
  		<h2 class="reports">S?lectionnez les exemplaires que vous souhaitez v?rifier</h2>
  		<p>
! 			Localisation de l'exemplaire (items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>voir</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen?ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
--- 5,14 ----
  		<h2 class="reports">S?lectionnez les exemplaires que vous souhaitez v?rifier</h2>
  		<p>
! 			Cote de l'exemplaire ((items.itemcallnumber) entre <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> et <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
  		</p>
  		<p><label>pas vu depuis</label>
  			<input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
  		</p>
! 		<p><label>afficher</label>
  			<input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5"><i> exemplaires commen?ant au </i> <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
  		</p>
***************
*** 29,33 ****
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code Barre</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>
--- 29,33 ----
  		<tr>
  			<th class="reports">Vu</th>
! 			<th class="reports">Code ? Barres</th>
  			<th class="reports">Cote</th>
  			<th class="reports">Titre</th>

Index: issues_by_borrower_category.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/issues_by_borrower_category.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** issues_by_borrower_category.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- issues_by_borrower_category.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 40,44 ****
  	<h1>Pr?ts par cat?gories de lecteurs</h1>
  	<form method="post">
! 		<p>Select a borrower category (or don't if you want to see global status) <input type="text" name="value"></p>
  		<p>S?lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">
--- 40,44 ----
  	<h1>Pr?ts par cat?gories de lecteurs</h1>
  	<form method="post">
! 		<p>S?lectionner une cat?gorie de lecteur (ou rien si vous souhaitez visualiser l'?tat global) <input type="text" name="value"></p>
  		<p>S?lectionnez une annexe : <!-- TMPL_VAR NAME="CGIbranch" --></p>
  		<input type="submit" value="OK" class="button">

Index: itemtypes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/itemtypes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** itemtypes.tmpl	24 Nov 2004 16:19:00 -0000	1.1
--- itemtypes.tmpl	5 Jan 2005 14:35:22 -0000	1.2
***************
*** 23,27 ****
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		 S?lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
--- 23,27 ----
  	<h1>Voir le catalogue par type de document</h1>
  	<form method="post">
! 		S?lectionner une annexe (ou rien si vous souhaitez le rapport pour toutes les annexes) <!-- TMPL_VAR NAME="CGIbranch" -->
  		<input type="submit" value="OK" class="button">
  		<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">

Index: reports-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/reports/reports-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** reports-home.tmpl	24 Nov 2004 16:19:00 -0000	1.5
--- reports-home.tmpl	5 Jan 2005 14:35:22 -0000	1.6
***************
*** 2,10 ****
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Rapports</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r?gl?s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r?gl?s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Ouvrages en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r?colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>
--- 2,10 ----
  <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>Bilans</h1>
  <ul>
  	<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Cas r?gl?s:</a> Rapport quotidien (hier)</li>
  	<li><a href="/cgi-bin/koha/stats.pl?time=today">Cas r?gl?s:</a> Rapport quotidien (aujourd'hui)</li>
! 	<li><a href="/cgi-bin/koha/overdue.pl">Documents en retard</a></li>
  	<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventaire/r?colement</a></li>
  	<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Recherche par Type de document</a></li>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:25 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/value_builder unimarc_field_225a.tmpl,1.3,1.4 unimarc_field_60X.tmpl,1.4,1.5 unimarc_field_700-4.tmpl,1.3,1.4 unimarc_field_700_701_702.tmpl,1.3,1.4
Message-ID: <E1CmCFx-0007Nn-NI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/value_builder

Modified Files:
	unimarc_field_225a.tmpl unimarc_field_60X.tmpl 
	unimarc_field_700-4.tmpl unimarc_field_700_701_702.tmpl 
Log Message:
french version for 2.2.0

Index: unimarc_field_225a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_225a.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_225a.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_225a.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,16 ****
! <html>
! <head>
! <title>Constructeur de champ UNIMARC 225a</title>
  </head>
  <body>
! <form name="f_pop" onSubmit="javascript:report()">
! <table>
! 	<tr>
! 		<td>Selectionnez une collection</td>
! 		<td><!-- TMPL_VAR name="collection" --></td>
! 	</tr>
! 	<tr><td colspan=2><input type="submit" value="OK"></td></tr>
! </table>
! </form>
  <script>
  	function report() {
--- 1,13 ----
! <!-- TMPL_INCLUDE name="auth-search-top.inc" -->
! <title>UNIMARC Field 225a builder</title>
  </head>
  <body>
! <div id="mainbloc">
! 	<form name="f_pop" onSubmit="javascript:report()">
! 		<h2 class="authority">Collection</h2>
! 		<p><label>Select a collection</label><!-- TMPL_VAR name="collection" --></p>
! 		<input type="submit" value="OK" class="button authority"></p>
! 	</form>
! </div>
  <script>
  	function report() {
***************
*** 20,23 ****
  	}
  </script>
! </body>
! </html>
--- 17,19 ----
  	}
  </script>
! <!-- TMPL_INCLUDE name="auth-search-bottom.inc" -->

Index: unimarc_field_60X.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_60X.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** unimarc_field_60X.tmpl	24 Nov 2004 16:21:17 -0000	1.4
--- unimarc_field_60X.tmpl	5 Jan 2005 14:35:23 -0000	1.5
***************
*** 1,5 ****
  <html>
  <head>
! 	<title>Recherche Th?saurus</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! 	<title>Thesaurus search</title>
  </head>
  <body>
***************
*** 38,42 ****
  	<tr>
  		<td valign="top">
! 		<h2>R?ponses</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
--- 38,42 ----
  	<tr>
  		<td valign="top">
! 		<h2>Results</h2>
  			<table>
  				<!-- TMPL_LOOP name="results" -->
***************
*** 57,61 ****
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>D?pendances</h2>
  			<!-- /TMPL_IF -->
  			<table>
--- 57,61 ----
  		<!-- TMPL_IF name=deeper -->
  		<td valign="top">
! 			<h2>Dependancies</h2>
  			<!-- /TMPL_IF -->
  			<table>
***************
*** 73,82 ****
  	</tr>
  	</table>
! <h2>Ajout en cours</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Cr?er une nouvelle autorit?/entr?e au th?saurus : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>
--- 73,82 ----
  	</tr>
  	</table>
! <h2>Adding</h2>
  <form name="f3_pop"  action="thesaurus_popup.pl" method="post">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
! 	Create a new authority/thesaurus entry : <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="Ajouter">
  	</form>

Index: unimarc_field_700-4.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700-4.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700-4.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700-4.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 11,15 ****
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>Illustrateur</option>
  			<option value="080 - pr?face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr?face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
--- 11,15 ----
  		<option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
  			<option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
! 			<option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
  			<option value="080 - pr?face, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>pr?face, notes</option>
  			<option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>

Index: unimarc_field_700_701_702.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/value_builder/unimarc_field_700_701_702.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** unimarc_field_700_701_702.tmpl	24 Nov 2004 16:21:17 -0000	1.3
--- unimarc_field_700_701_702.tmpl	5 Jan 2005 14:35:23 -0000	1.4
***************
*** 1,5 ****
  <html>
  <head>
! <title>Constructeur d'autorit? nom de personne</title>
  </head>
  <body>
--- 1,5 ----
  <html>
  <head>
! <title>Personal Authorities builder</title>
  </head>
  <body>
***************
*** 14,18 ****
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="FIN" onclick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
--- 14,18 ----
  	<input type="hidden" name="c" value="<!-- TMPL_VAR name="c" -->">
  	<input type="hidden" name="f" value="<!-- TMPL_VAR name="f" -->">
! 	<input type="submit" value="Recherche"><input type="button" value="END" onClick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
***************
*** 30,34 ****
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit?
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>
--- 30,34 ----
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="add">
! 	Ajouter une nouvelle autorit?: <input type="text" name="insert" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="submit" name="NEW" value="NOUVEAU">
  	</form>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ branchtransfers.tmpl,1.6,1.7 circulation.tmpl,1.10,1.11 returns.tmpl,1.6,1.7
Message-ID: <E1CmCGP-0007P7-QQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/circ

Modified Files:
	branchtransfers.tmpl circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/branchtransfers.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** branchtransfers.tmpl	24 Nov 2004 16:14:37 -0000	1.6
--- branchtransfers.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 6,10 ****
  
  <h1>Pr?t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" -->   <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer Param?tres</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
--- 6,10 ----
  
  <h1>Pr?t : Transferts</h1>
! <b>Site:</b> <!-- TMPL_VAR NAME="genbrname" --> <b>Imprimante:</b> <!-- TMPL_VAR NAME="genprname" --> <a href="selectbranchprinter.pl" class="button">Changer R?glages</a>
  <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->">
  <input type="hidden" name="printer" value="<!-- TMPL_VAR NAME="printer" -->">
***************
*** 84,88 ****
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
--- 84,88 ----
  	<!-- TMPL_LOOP Name="errmsgloop" -->
  				<!-- TMPL_IF Name="errbadcode" -->
! 			Pas d'exemplaire avec code ? barres : <!-- TMPL_VAR NAME="msg" -->
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errispermanent" -->
***************
*** 106,110 ****
  		</select></p>
  
! 	<p><b>Entrez le Code Barre du document :</b> Code Barre du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
--- 106,110 ----
  		</select></p>
  
! 	<p><b>Entrez le Code ? Barres du document :</b> Code ? Barres du document: <input name="barcode" size="10">
  	<input type="hidden" name="tobranchcd" value=<!-- TMPL_VAR NAME="tobrancd" -->>
  
***************
*** 120,124 ****
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf?r?s</th></tr>
! 		<tr><th>Code Barre</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>?</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">
--- 120,124 ----
  		<table border="1" cellpadding="5" cellspacing="0" bgcolor="#dddddd">
  		<tr><th colspan="6">Exemplaires transf?r?s</th></tr>
! 		<tr><th>Code ? Barres</th><th>Titre</th><th>Auteur</th><th>Type</th><th>De</th><th>?</th></tr>
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td align="center" bgcolor="<!-- TMPL_VAR NAME="color" -->">

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** circulation.tmpl	24 Nov 2004 16:14:38 -0000	1.10
--- circulation.tmpl	5 Jan 2005 14:35:19 -0000	1.11
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Circulation : pr?ts</h1>
  
  <!--
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="circulation-top.inc" -->
   <div id="mainbloc">
! 	<h1 class="circulation">Pr?t : Sorties</h1>
  
  <!--
***************
*** 11,15 ****
  		<h2 class="circulation">Param?tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param?tres</a>
  		</p>
  	
--- 11,15 ----
  		<h2 class="circulation">Param?tres</h2>
  		<p>
! 			<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R?glages</a>
  		</p>
  	
***************
*** 41,45 ****
  			</p>
  			<p>Cat?gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Pr?ts<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
--- 41,45 ----
  			</p>
  			<p>Cat?gorie : <!-- TMPL_VAR NAME="categorycode" --></p>
! 			<p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En retard<!-- /TMPL_IF --></p>
  			<p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
  
***************
*** 65,70 ****
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code barre du livre</h2>
! 		<p>Code Barre de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr?ter" class="button circulation"></p>
  		<p>
  			<select name="day">
--- 65,70 ----
  	<div id="bloc25">
  	<form method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 		<h2 class="circulation">Entrez le code ? barres du livre</h2>
! 		<p>Code ? Barres de l'exemplaire :<input name="barcode" size="10"> <input type="submit" value="Pr?ter" class="button circulation"></p>
  		<p>
  			<select name="day">
***************
*** 152,156 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code barre est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 152,156 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<p class="problem">Le code ? barres est inconnu</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 196,199 ****
--- 196,205 ----
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
  			<form method="post">
+ 				<!-- TMPL_IF NAME="RESERVED" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r?servation</p>
+ 				<!-- /TMPL_IF -->
+ 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
+ 					<p><input type="checkbox" checked name="cancelreserve" value="1">Annuler r?servation</p>
+ 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
  				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">">
***************
*** 203,206 ****
--- 209,213 ----
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->">
  				<input type="submit" value="Confirmer le pr?t" class="button circulation">
+ 				<a href="circulation.pl?borrnumber=<!-- TMPL_VAR NAME="borrowernumber" -->" class="button circulation">Ne pas pr?ter</a>
  			</form>
  			<!-- /TMPL_UNLESS -->
***************
*** 224,228 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 231,235 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code ? Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
***************
*** 253,257 ****
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code Barre</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>
--- 260,264 ----
  		<tr>
  			<th class="circulation">Date de retour</th>
! 			<th class="circulation">Code ? Barres</th>
  			<th class="circulation">Titre</th>
  			<th class="circulation">Auteur</th>

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/returns.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** returns.tmpl	24 Nov 2004 16:14:38 -0000	1.6
--- returns.tmpl	5 Jan 2005 14:35:19 -0000	1.7
***************
*** 4,8 ****
  	<h1 class="circulation">Pr?t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer Param?tres</a>
  	</p>
  	
--- 4,8 ----
  	<h1 class="circulation">Pr?t: Retours</h1>
  	<p>
! 		<b>Site:</b> <!-- TMPL_VAR NAME="branchname" -->, <b>Imprimante:</b> <!-- TMPL_VAR NAME="printername" --> <a href="selectbranchprinter.pl" class="button circulation">Changer R?glages</a>
  	</p>
  	
***************
*** 11,15 ****
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu? 'En attente' :</h2>
! 			<p> Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not? en attente ? <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
--- 11,15 ----
  			<!-- TMPL_IF Name="waiting" -->
  				<h2 class="circulation">Exemplaire marqu? 'En attente' :</h2>
! 			<p>Le document <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) est not? en attente ? <b><!-- TMPL_VAR NAME="branchname" --></b> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  					<form method="post" action="returns.pl">
  					<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 25,29 ****
  				<h2 class="circulation">Exemplaire marqu? 'En attente' :</h2>
  				<p>
! 					Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  needs to be transfered to <b><!-- TMPL_VAR NAME="branchname" --></b>  to be picked up by  <!-- TMPL_VAR NAME="name" -->  (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
--- 25,29 ----
  				<h2 class="circulation">Exemplaire marqu? 'En attente' :</h2>
  				<p>
! 					L'exemplaire: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) doit ?tre transf?r? ? <b><!-- TMPL_VAR NAME="branchname" --></b> pour ?tre retir? par <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR NAME="borcnum" --></a>).
  				</p>
  				<center>
***************
*** 43,47 ****
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R?servation trouv?e</h2>
! 				<p>Item: <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->)  <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">  <!-- TMPL_VAR NAME="itembarcode" -->  </a>  for <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
--- 43,47 ----
  			<!-- TMPL_IF Name="reserved" -->
  				<h2 class="circulation">R?servation trouv?e</h2>
! 				<p>Exemplaire : <!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR NAME="itemauthor" -->) <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;"> <!-- TMPL_VAR NAME="itembarcode" --> </a> pour <!-- TMPL_VAR NAME="name" --> (<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR NAME="borcnum" --></a>) peut ?tre retir? ? <b> <!-- TMPL_VAR NAME="branchname" --></b>.
  				</p>
  				<p>
***************
*** 84,89 ****
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code barre du livre</h2>
! 				<label class="label20">Code Barre de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
--- 84,89 ----
  		<div id="bloc25">
  			<form method="post" action="/cgi-bin/koha/circ/returns.pl">
! 				<h2 class="circulation">Entrez le code ? barres du livre</h2>
! 				<label class="label20">Code ? Barres de l'exemplaire :</label><input name="barcode" size="10">
  				</table>
  				<!-- TMPL_LOOP Name="inputloop" -->
***************
*** 100,104 ****
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code barre : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
--- 100,104 ----
  					<span id="problem">
  					<!-- TMPL_IF Name="badbarcode" -->
! 						Pas d'exemplaire avec code ? barres : <!-- TMPL_VAR NAME="msg" -->
  					<!-- /TMPL_IF -->
  					<!-- TMPL_IF Name="ispermanent" -->
***************
*** 119,123 ****
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur l'ouvrage rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
--- 119,123 ----
  	<!-- TMPL_IF Name="returned" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Information sur le document rendu</h2>
  			<p>Titre : <!-- TMPL_VAR NAME="itemtitle" --></p>
  			<h2 class="circulation">Information lecteur</h2>
***************
*** 162,174 ****
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Ouvrages rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code Barre</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Lecteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->
--- 162,174 ----
  	<!-- TMPL_IF Name="riloop" -->
  		<div id="bloc25">
! 			<h2 class="circulation">Documents rendus</h2>
  			<table>
  			<tr>
  				<th class="circulation">Date de retour</th>
! 				<th class="circulation">Code ? Barres</th>
  				<th class="circulation">Titre</th>
  				<th class="circulation">Auteur</th>
  				<th class="circulation">Type</th>
! 				<th class="circulation">Emprunteur</th>
  			</tr>
  			<!-- TMPL_LOOP Name="riloop" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help bull-home.tmpl,1.1,1.2
Message-ID: <E1CmCGP-0007PB-V2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help

Modified Files:
	bull-home.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:50 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 2,11 ****
  	<h1>Aide de Abonnement P?riodiques</h1>
  	<ul>
! 		<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  		<li>Si vous voulez cr?er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv? l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d?tails de l'abonnement</li>
! 				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC & librarian interface)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 2,11 ----
  	<h1>Aide de Abonnement P?riodiques</h1>
  	<ul>
! 		<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  		<li>Si vous voulez cr?er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span></li>
  		<li>Lorsque vous avez trouv? l'abonnement que vous cherchez, vous pouvez: </li>
  			<ul>
  				<li>Voir les d?tails de l'abonnement</li>
! 				<li>Recevoir chaque num?ro et/ou g?r? ce qui s'affiche dans le r?sum? de l'abonnement (? l'OPAC et dans l'interface biblioth?caire)</li>
  	</ul>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves addbookbybiblionumber.tmpl,1.2,1.3 shelves.tmpl,1.2,1.3
Message-ID: <E1CmCGQ-0007PD-2h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
french version for 2.2.0

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addbookbybiblionumber.tmpl	24 Nov 2004 16:13:32 -0000	1.2
--- addbookbybiblionumber.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 6,11 ****
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter une ?tag?re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<input type="submit" value="Ajouter une ?tag?re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 6,19 ----
  	<p><label>Titre</label><!-- TMPL_VAR NAME="title" --></p>
  	<p><label>Auteur</label><!-- TMPL_VAR NAME="author" --></p>
! 	<p><label>Ajouter dans l'?tag?re virtuelle</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! 	<p>ou ajouter une nouvlle ?tag?re virtuelle </p>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 		<select name="category">
! 			<option value="1">Priv?</option>
! 			<option value="2">Publique</option>
! 			<option value="3">Libre</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Ajouter dans l'?tag?re virtuelle" class="button catalogue">
  </form>
  <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

Index: shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bookshelves/shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** shelves.tmpl	24 Nov 2004 16:13:33 -0000	1.2
--- shelves.tmpl	5 Jan 2005 14:35:18 -0000	1.3
***************
*** 4,63 ****
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Contenus de <!-- TMPL_VAR NAME="shelfname" -->
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="itemsloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  				</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<br>
! 		<a href="shelves.pl" class="button">Liste des ?tag?res</a>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<!-- TMPL_IF name="manageshelf" -->
! 			<input type="submit" value="Retirer les Exemplaires S?lectionn?s" class="button">
! 		<!-- /TMPL_IF -->
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<form>
! 		<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<input type="hidden" name="modifyshelfcontents" value="1">
! 		<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 		<table>
! 			<tr>
! 				<td>
! 					ajouter un livre par code barre dans <!-- TMPL_VAR NAME="shelfname" -->:
! 				</td>
! 				<td>
! 					<input name="addbarcode">
! 					<input type="hidden" name="modifyshelfcontents" value="1">
! 					<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 					<input type="submit" value="Enregistrer" class="button">
! 				</td>
! 			</tr>
! 		</table>
! 	</form>
  	<!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
- 		<h1 class="catalogue">Etag?res</h1>
  		<div id="bloc25">
  					<h2 class="catalogue">S?lectionner les Etag?res ? Supprimer</h2>
--- 4,64 ----
  <!-- TMPL_IF Name="viewshelf" -->
  	<form>
! 		<h1 class="catalogue"><!-- TMPL_VAR NAME="shelfname" --></h1>
! 
! 		<div id="bloc25">
! 		<h2 class="catalogue">Contenu des Etag?res</h2>
! 			<table class="small">
! 				<tr colspan="4">
! 					<th class="catalogue">supprimer</th>
! 					<th class="catalogue">Code ? Barres</th>
! 					<th class="catalogue">Titre</th>
! 					<th class="catalogue">Auteur</th>
  				</tr>
! 				<!-- TMPL_LOOP Name="itemsloop" -->
! 					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
! 					</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<!-- TMPL_IF name="manageshelf" -->
! 				<input type="submit" value="Retirer les Exemplaires S?lectionn?s" class="button catalogue">
! 			<!-- /TMPL_IF -->
! 		</div>
  	</form>
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc25">
! 		<form>
! 		<h2 class="catalogue">Ajouter un livre par code ? barre</h2>
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input name="addbarcode">
! 			<input type="hidden" name="modifyshelfcontents" value="1">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
! 			<input type="submit" value="Enregistrer" class="button catalogue">
! 		</form>
! 	</div>
  	<!-- /TMPL_IF -->
+ 	<div id="bloc25">
+ 		<a href="shelves.pl" class="button catalogue">Liste des ?tag?res</a>
+ 	</div>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
+ 		<h1 class="catalogue">Etag?res</h1>
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  		<div id="bloc25">
  					<h2 class="catalogue">S?lectionner les Etag?res ? Supprimer</h2>
***************
*** 70,74 ****
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
  						</p>
  						<!-- /TMPL_IF -->
--- 71,75 ----
  								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
  							</label>
! 								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"> <!-- TMPL_VAR NAME="shelfname" --> </a> (<!-- TMPL_VAR NAME="shelfbookcount" --> document(s))
  						</p>
  						<!-- /TMPL_IF -->
***************
*** 92,98 ****
  					</select>
  				</p>
! 				<p> <li> une ?tag?re priv?e est g?r?e par vous et peut ?tre vue uniquement par vous- m?me.</li>
! 					<li>  Une ?tag?re publique peut-?tre vue par tout le monde, mais g?r?e uniquement par vous-m?me</li>
! 					<li> Une ?tag?re libre peut-?tre g?r?e par tous les usagers</li>
  				</p>
  				<p>
--- 93,99 ----
  					</select>
  				</p>
! 				<p> <li>une ?tag?re priv?e est g?r?e par vous et peut ?tre vue uniquement par vous- m?me.</li>
! 					<li> Une ?tag?re publique peut-?tre vue par tout le monde, mais g?r?e uniquement par vous-m?me</li>
! 					<li> Une ?tag?re libre peut-?tre g?r?e par tous les utilisateurs.</li>
  				</p>
  				<p>
***************
*** 104,128 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<table>
! 			<tr>
! 				<th class="catalogue">
! 					Liste des Etag?res
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 					<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 						<!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> livres)
! 					</a>
! 				</td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 		<P>
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des ?tag?res virtuelles</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->
--- 105,191 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc25">
! 			<h2 class="catalogue">Liste des ?tag?res</h2>
! 			<table class="small">
! 				<tr>
! 					<th class="catalogue">Nom de l'?tag?re</th>
! 					<th class="catalogue">Cat?gorie</th>
! 					<th class="catalogue">Contenu</th>
! 					<th class="catalogue">Modifier</th>
! 				</tr>
! 				<!-- TMPL_LOOP Name="shelvesloop" -->
! 				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
! 							<!-- TMPL_VAR NAME="shelfname" -->
! 						</a>
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_IF NAME="category1" -->
! 							Priv?
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category2" -->
! 							Publique
! 						<!-- /TMPL_IF -->
! 						<!-- TMPL_IF NAME="category3" -->
! 							Libre
! 						<!-- /TMPL_IF -->
! 					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<!-- TMPL_VAR NAME="shelfbookcount" --> documents
! 					</td>
! 					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 							<a href="shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button catalogue">Modifier</a> <!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
! 						</td>
! 					<!-- /TMPL_IF -->
! 				</tr>
! 				<!-- /TMPL_LOOP -->
! 			</table>
! 		</div>
! 		<div id="bloc25">
  			<a href="shelves.pl?shelves=1" class="button catalogue">Ajouter ou supprimer des ?tag?res virtuelles</a>
! 		</div>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <!-- TMPL_IF name="edit" -->
+ 	<div id="bloc25">
+ 		<form method="post">
+ 			<input type="hidden" name="op" value="modifsave">
+ 			<h2 class="catalogue">Modifier l'?tag?re</h2>
+ 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
+ 			<p><label>Nom</label><input type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->"></p>
+ 			<p><label>Propri?taire</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
+ 			<p><label>Cat?gorie</label>
+ 				<select name="category">
+ 					<!-- TMPL_IF name="category1" -->
+ 						<option value="1" selected>Priv?</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="1">Priv?</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category2" -->
+ 						<option value="2" selected>Publique</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="2">Publique</option>
+ 					<!-- /TMPL_IF -->
+ 					<!-- TMPL_IF name="category3" -->
+ 						<option value="3" selected>Libre</option>
+ 					<!-- TMPL_ELSE -->
+ 						<option value="3">Libre</option>
+ 					<!-- /TMPL_IF -->
+ 				</select>
+ 			</p>
+ 			<p> <li>une ?tag?re priv?e est g?r?e par vous et peut ?tre vue uniquement par vous- m?me.</li>
+ 				<li> Une ?tag?re publique peut-?tre vue par tout le monde, mais g?r?e uniquement par vous-m?me</li>
+ 				<li> Une ?tag?re libre peut-?tre g?r?e par tous les utilisateurs.</li>
+ 			</p>
+ 			<p>
+ 				<input type="submit" value="Enregistrer" class="button catalogue">
+ 			</p>
+ 
+ 		</form>
+ 	</div>
+ <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/circ circulation.tmpl,1.1,1.2 returns.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pc-Bm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/circ

Modified Files:
	circulation.tmpl returns.tmpl 
Log Message:
french version for 2.2.0

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/circulation.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** circulation.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- circulation.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,11 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Circulation : pr?ts</h1>
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations from a workstation, after which a browser cookie will remember the correct settings. If you do circulations under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb) and the statistical reports will credit all circulations to the wrong branch.</p>
  
! <p>Now start by scanning the borrower's barcode or type in their name to find their account. Once Koha has found the borrower, you will see a new form for scanning or typing the item's identifying number (usually a barcode).</p>
  
! <p>If you wish to have this item and all subsequent items in this transaction to have a date due other than the default date due defined for the item type, use the "Sticky Due Date" to set the date due before scanning the first item.</p>
  
! <p>If the issuing has nothing specific, it will be done immediatly and shown (with other borrower issues) at bottom.</p>
! <p>If the issuing is problematic, then another box will appear (in <b>RED</b>) and ask for confirmation if possible. If the issuing is really impossible (for example, the barcode does not exist), then you can't confirm the issue. If it is possible but has something that needs confirmation (like item being issued to another borrower, or borrower having issued too many items), then you must confirm the issuing. If the confirmation means another operation (if item is issued to another borrower, then issuing also means make the return), then it's also done</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,11 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>Pr?t/Aide des sorties</h1>
! <p>Avant de commencer, il est tr?s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n?cessaire.Cela devra ?tre fait seulement la premi?re fois que vous ferez du pr?t (ou des retours) ? partir d'un poste de travail, ensuite un cookie du navigateur m?morisera le r?glage correct.</p>
  
! <p>Maintenant commencez par scanner le code ? barres du lecteur ou tapez son nom pour trouver leur compte.Lorsque Koha a trouv? un lecteur, vous verrez un nouveau pav? pour scanner ou taper le num?ro identifiant le document (en g?n?ral un code ? barres).</p>
  
! <p>Si vous souhaitez que ce document et les documents suivants de cette transaction aient une date de retour autre que la date par d?faut d?finie pour ce type de document utilisez la "date de retour manuelle" pour choisir la date de retour avant de scanner le premier document.</p>
  
! <p>Si le pr?t n'a rien de sp?cial, il sera fait imm?diatement et affich? (avec les autres emprunts du lecteur)en bas de la page.</p>
! <p>Si le pr?t pose probl?me, alors un autre pav? appara?tra (en <b>ROUGE</b>) et vous demandera de confirmer que le pr?t est possible.Si le pr?t est vraiment impossible (par exemple le code ? barres n'existe pas), alors vous ne pouvez pas le confirmer.Si le pr?t est possible mais n?cessite confirmation (comme pour un document pr?t? ? un autre lecteur, ou un lecteur ayant emprunt? trop de docuements), vous pourrz alors confirmer le pr?t.Si la confirmation implique une autre op?ration (si le document est pr?t? ? un autre lecteur, le pr?t? implique que le retour soir fait), alors elle sera aussi effectu?e.</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/circ/returns.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** returns.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- returns.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,9 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Before you begin, it is very important that you take note of the branch and printer settings and change them if necessary. This should only have to be done the first time you do circulations (or returns) from a workstation, after which a browser cookie will remember the correct settings. If you do returns under the wrong branch settings (for example, your branch setting is "Suburb," but you are actually working at the "Downtown" branch), then Koha will reset the location of all items scanned to the incorrect branch (Suburb).</p>
  
! <p>Now simply scan or type the returned item's identifying number (usually a barcode) in the box provided.</p>
  
! <p>The return is done and if there is something specific for the item or the borrower (like borrower having debts), a red box will warn you</p>
! <p>If the item has been requested by someone else, you also are asked to validate the request. If you confirm it, item is changed to a "waiting" status and you should warn the borrower that the item is available</p>
! <p>If the item is requested by someone in anothe branch, then you must validate the transfer too</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,9 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <p>Avant de commencer, il est tr?s important que vous verifiez le site et l'imprimante choisis et que vous les changiez si n?cessaire. Cela devra ?tre fait seulement la premi?re fois que vous ferez du pr?t (ou des retours) ? partir d'un poste de travail, ensuite un cookie du navigateur m?morisera le r?glage correct.</p>
  
! <p>Maintenant scannez simplement ou tapez le num?ro identifiant du document (habituellement un code ? barres)dans le pav? propos?.</p>
  
! <p>Le retour est fait et s'il y a quelque chose de particulier sur le document ou l'emprunteur (comme un emprunteur ayant des dettes), un pav? rouge vous en avertira</p>
! <p>Si le document a ?t? r?serv? par quelqu'un d'autre, on vous demandera aussi de valider la r?servation.Si vous la confirmez, le document est mis ? l'?tat "en attente" et vous devrez avertir le lecteur que le docuement est disponible.</p>
! <p>Si le document est r?serv? par quelqu'un d'un autre site, vous devez aussi valider le transfert</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/import breeding.tmpl,1.4,1.5
Message-ID: <E1CmCGQ-0007PK-50@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/import/breeding.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** breeding.tmpl	24 Nov 2004 16:16:53 -0000	1.4
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.5
***************
*** 6,12 ****
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import?s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import? parce que d?j? dans la base de donn?e</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import?,parce que d?j? dans le r?servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait?s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
--- 6,12 ----
  	<ul>
  		<p><!-- TMPL_VAR NAME="imported" --> enregistrements import?s</p>
! 		<p><!-- TMPL_VAR NAME="alreadyindb" --> non import? parce que d?j? dans la base de donn?es</p>
  		<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import?,parce que d?j? dans le r?servoir</p>
! 		<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import? parce qu'ils ne semblent pas ?tre au format MARC (ou n? ISBN/ ISSN manquant) !</p>
  		<p><!-- TMPL_VAR NAME="total" --> enregistrements trait?s</p>
  		<p><a href="/cgi-bin/koha/admin-home.pl">Retour</a>
***************
*** 14,21 ****
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 		<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 		<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 		<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 14,21 ----
  	<!-- TMPL_ELSE -->
  	<ul>
! 		<li>S?lectionner un fichier ? importer dans le r?servoir.Il sera analys?, et pour chaque ISBN trouv?, une nouvelle copie sera cr?? dans le r?servoir.</li>
! 		<li>Si un ISBN existe d?j? dans le r?servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'?craser l'ancien.</li>
! 		<li>Vous pouvez donner un nom ? cette importation. Cela peut ?tre utile, lors de la cr?ation d'une notice, pour vous souvenir d'o? vient l'enregistrement MARC propos?!</li>
! 		<li>Bien s?r, si l'ISBN existe d?j? dans la base de donn?es, la notice sera ignor?e.</li>
  	</ul>
  	<form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc search.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PN-45@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/search.marc

Modified Files:
	search.tmpl 
Log Message:
french version for 2.2.0

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/search.marc/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 3,27 ****
  	<p>La recherche est divis?e en deux parties diff?rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p> Les champs usuels sont dans la partie haute de l'?cran. Ils contiennent :</p>
  		<ul>
! 			<li>Mot cl? :  Recherche sur l'ensemble</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code Barre : le code barre de la bibloth?que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
! 			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
  		</ul>
  	<p>M?thode de Recherche</p>
  		<ul>
! 			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
! 			<li> Une notice est s?lectionn?e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>inf?rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen?ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignor?</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,27 ----
  	<p>La recherche est divis?e en deux parties diff?rentes :</p>
  	<h2>Champs usuels</h2>
! 	<p>Les champs usuels sont dans la partie haute de l'?cran. Ils contiennent :</p>
  		<ul>
! 			<li>Tous les mots : recherche sur l'ensemble de la notice</li>
  			<li>Titre</li>
  			<li>Auteur</li>
! 			<li>Code ? Barres : le code ? barres de la bibloth?que pour le livre</li>
  			<li>Illustrateur</li>
  			<li>Dewey</li>
! 			<li>Type de document : s?lectionnez ici un type de document. Si aucun n'est s?lectionn?, la recherche est lanc?e sur tous les types</li>
! 			<li>Site : S?lectionnez un site pr?cis.Si vous n'en s?lectionnez aucun, la recherche se fera sur tous les sites</li>
  		</ul>
  	<p>M?thode de Recherche</p>
  		<ul>
! 			<li>Si vous renseignez plus d'un champ, votre recherche sera de type "et" (les notices contenant <b>titre</b> ET <b>auteur</b>)</li>
! 			<li>Une notice est s?lectionn?e si son champ <b>contient</b>le terme que vous avez saisi</li>
! 			<li>Si vous saisissez un * (ou un %) ? la fin d'un terme, Koha recherche les mots qui commencent par le terme saisi <b>inf?rieur*</b> signifie : trouver les notices qui ont un <b>titre contient un mot commen?ant par lower</b></li>
  		</ul>
  	<h2 class="catalogue">Recherche MARC</h2>
! 	<p>Dans la partie inf?rieure de l'?cran de recherche, le pav? <b>Plus de champs</b>, vous permet de saisir ce que vous voulez  :  et, ou, non (exclusions), recherche sur tous les champs/sous-champs MARC</p>
  	
! 	<p><b>REMARQUE IMPORTANTE : </b>Pour des raisons d'efficacit? l'* est active uniquement si vous entrez un mot d'au moins 3 lettres.pour les mots  de  3 lettres ou moins, l'* est ignor?e <b>ignor?</b></p>
  	<br/>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/import breeding.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PF-5y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/import

Modified Files:
	breeding.tmpl 
Log Message:
french version for 2.2.0

Index: breeding.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/import/breeding.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** breeding.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- breeding.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 2,13 ****
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>It is useful to import a bunch of iso2709 biblios that can be used later for a quick cataloguing</p>
! <p>First, you need to browse your computer to find the MARC record that you grabbed for your item. Click on</p>
! <p>Choose File to browse.</p>
! <p>If you aren't sure if you've already imported a record, keep the radio button set to</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract?res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : This tool is NOT intended to import iso2709 in your ACTIVE DB. If you need to migrate datas from another ILS, then you must consider $kohaInstall/scripts/misc/bulkmarcimport.pl</b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 2,13 ----
  <h1>Importer cette notice</h1>
  <p>This is one of the screens you will see frequently if you are starting from scratch.</p>
! <p>C'est utile d'importer un paquet de notices iso2709 qui pourront ?tre utilis?es plus tard pour un catalogage rapide</p>
! <p>Au pr?alable, vous devez parcourir votre ordinateur pour trouver l'enregistrement MARC que vous avez s?lectionn? pour votre document.Cliquez</p>
! <p>Choisir le dossier ? rechercher.</p>
! <p>Si vous n'?tes pas s?r d'avoir d?j? import? un enregistrement laissez le button r?gl? sur</p>
  <p>Ignorer celui-ci, garder l'existant</p>
  <p>You can "name" the import to help you when you need to choose between more than 1 imported biblio (or just want to keep trace on where the biblios comes from)</p>
  <p>Codage des caract?res (MARC21 ou UNIMARC)</p>
  <p>You don't need to actually name every import, so you don't need to fill in this box if you don't want to. It is useful for telling imports apart if you've more than one of the same record.</p>
! <p><b>IMPORTANT : Cet outil n'est PAS pr?vu pour importer de l' iso2709 dans votre Base de Donn?es ACTIVE.Si vous avez besoin de migrer des donn?es ? partir d'un autre SIGB, alors vous devez utiliser $kohaInstall/scripts/misc/bulkmarcimport.pl </b></p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/export marc.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007PM-3g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/export

Modified Files:
	marc.tmpl 
Log Message:
french version for 2.2.0

Index: marc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/export/marc.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** marc.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- marc.tmpl	5 Jan 2005 14:35:20 -0000	1.2
***************
*** 1,8 ****
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>iso 2709 export</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Records are downloaded to the workstation that requests the export and are saved in a file called "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- 1,8 ----
  <!-- TMPL_INCLUDE name="help-top.inc" -->
! <h1>export iso2709</h1>
  <p>This is a tool to export your bibliographic records in standard MARC communications format (ISO2709). It exports only the basic bibliographic information with no holdings information other than any holdings information originally loaded into Koha using the bulkmarcimport tool.</p>
  
  <p>You are asked to provide a starting biblio record number and an ending number for the export. If you want to export all of your records, leave the start and end numbers blank.</p>
  
! <p>Les enregistrements sont charg?s sur le poste de travail qui a demand? l'exportation et sont sauv?s dans un fichier nomm? "marc.pl."</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/marcimport AcceptBiblioitem.tmpl,1.3,1.4 AcceptItemCopy.tmpl,1.3,1.4 marcimportdetail.tmpl,1.3,1.4
Message-ID: <E1CmCGQ-0007Ps-Mx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/marcimport

Modified Files:
	AcceptBiblioitem.tmpl AcceptItemCopy.tmpl 
	marcimportdetail.tmpl 
Log Message:
french version for 2.2.0

Index: AcceptBiblioitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptBiblioitem.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptBiblioitem.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptBiblioitem.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 8,17 ****
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d?j? dans la Base de Donn?e
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> is already in the database with  biblionumber <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
--- 8,17 ----
  	<table border="0" width="50%" cellpadding="10" cellspacing="0">
  		<tr>
! 			<th background="/images/background-acq.gif">Enregistrement d?j? dans la base de donn?es
  			</th>
  		</tr>
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> est d?j? dans la base de donn?es avec le num?ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" -->
  			  </td>
  		</tr>
***************
*** 26,30 ****
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" -->has been entered into the database with biblionumber  <!-- TMPL_VAR NAME="biblionumber" --> and biblioitemnumber <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
--- 26,30 ----
  		<tr>
  			<td bgcolor="#dddddd">
! 				<!-- TMPL_VAR NAME="title" --> a ?t? saisi dans la base de donn?es avec le num?ro de notice <!-- TMPL_VAR NAME="biblionumber" --> / <!-- TMPL_VAR NAME="biblioitemnumber" --></td>
  		</tr>
  	  </table>
***************
*** 41,45 ****
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE BARRE</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>
--- 41,45 ----
          <input type="hidden" name="file" value="<!-- TMPL_VAR NAME="file" -->">
          <table border="0">
!           <tr><td>CODE A BARRES</td><td><input name="barcode" size="10" value="<!-- TMPL_VAR NAME="barcode" -->">
            Site d'affectation: <select name="homebranch"><!-- TMPL_VAR NAME="branchselect" --></select>
  	  </td></tr>

Index: AcceptItemCopy.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/AcceptItemCopy.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** AcceptItemCopy.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- AcceptItemCopy.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 2,6 ****
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code Barre <b><!-- TMPL_VAR NAME="barcode" --></b> a d?j? ?t? attribu?</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
--- 2,6 ----
  <center>
  <!-- TMPL_IF NAME="BARCODE_EXISTS" -->
! 	<font color="red">Le Code ? Barres <b><!-- TMPL_VAR NAME="barcode" --></b> a d?j? ?t? attribu?</font><p>
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="ITEM_ERROR" -->
***************
*** 10,14 ****
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout? avec code barre <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>
--- 10,14 ----
  	<table border="1" align="center" cellpadding="10">
  		<tr><td bgcolor="yellow">
! 			Exemplaire ajout? avec code ? barres <!-- TMPL_VAR NAME="barcode" -->
  		</td></tr>
  	</table>

Index: marcimportdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/marcimport/marcimportdetail.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marcimportdetail.tmpl	24 Nov 2004 16:17:14 -0000	1.3
--- marcimportdetail.tmpl	5 Jan 2005 14:35:21 -0000	1.4
***************
*** 32,36 ****
  	<tr bgcolor="#ddaaaa"><td>Ann?e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Localisation</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>
--- 32,36 ----
  	<tr bgcolor="#ddaaaa"><td>Ann?e de Publication</td><td><input type="text" name="pubyear" value="<!-- TMPL_VAR NAME="publicationyear" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#dddddd"><td>Editeur</td><td><input type="text" name="publisher" value="<!-- TMPL_VAR NAME="publishercode" -->" size="40" maxlength="255"></td></tr>
! 	<tr bgcolor="#ddaaaa"><td>Emplacement</td><td><input type="text" name="place" value="<!-- TMPL_VAR NAME="place" -->" size="40" maxlength="255"></td></tr>
  	<tr bgcolor="#dddddd"><td>Pages</td><td><input type="text" name="pages" value="<!-- TMPL_VAR NAME="pages" -->" size="5" maxlength="10"></td></tr>
  	<tr bgcolor="#ddaaaa"><td>Taille</td><td><input type="text" name="size" value="<!-- TMPL_VAR NAME="size" -->" size="40" maxlength="40"></td></tr>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/barcodes barcodes-bottom.inc,1.1,1.2 barcodes-top.inc,1.1,1.2 barcodes.tmpl,1.1,1.2 printerConfig.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Px-Oj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/barcodes

Modified Files:
	barcodes-bottom.inc barcodes-top.inc barcodes.tmpl 
	printerConfig.tmpl 
Log Message:
french version for 2.2.0

Index: barcodes-bottom.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-bottom.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-bottom.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-bottom.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 8,12 ****
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr?t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Rapports</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param?tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 
--- 8,12 ----
  <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> ||
  <a href="/cgi-bin/koha/circ/circulation.pl">Pr?t</a> ||
! <a href="/cgi-bin/koha/reports-home.pl">Bilans</a> ||
  <a href="/cgi-bin/koha/admin-home.pl">Param?tres</a> ||
  <a href="/cgi-bin/koha/about.pl">A propos</a> || 

Index: barcodes-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes-top.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes-top.inc	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes-top.inc	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 204,212 ****
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Home</a>  <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>  <a class="members" href="/cgi-bin/koha/members/members-home.pl">Members</a>  <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>  <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>  <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>  <a class="reports" href="/cgi-bin/koha/reports-home.pl">Reports</a>  <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Parameters</a>  <a class="about" href="/cgi-bin/koha/about.pl">About</a>  <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Funds</a>  <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2">Auth value</a>  <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Thesaurus</a>  <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Currencies</a>  <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Printers</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->

--- 204,212 ----
  <div id="menubar">

  	<span class="koha">KOHA</span>

! 	<a class="home" href="/cgi-bin/koha/mainpage.pl">Accueil</a> <a class="catalogue" href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a> <a class="members" href="/cgi-bin/koha/members/members-home.pl">Lecteurs</a> <a class="acquisition" href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a> <a class="circulation"  href="/cgi-bin/koha/circ/circulation.pl">Pr?t</a> <a class="authority" href="/cgi-bin/koha/authorities/authorities-home.pl">Autorit?s</a> <a class="reports" href="/cgi-bin/koha/reports-home.pl">Rapports</a> <a class="parameters" href="/cgi-bin/koha/admin-home.pl">Param?tres</a> <a class="about" href="/cgi-bin/koha/about.pl">A propos</a> <a class="catalogue" href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Aide</a>

  </div>

  <div id="submenu">

  	<span class="koha">options >></span>

! 	<a href="/cgi-bin/koha/admin/aqbookfund.pl" class="submenu">Cr?dits</a> <a href="/cgi-bin/koha/admin/authorised_values.pl" class="submenu2"> Valeurs autoris?es</a> <a href="/cgi-bin/koha/admin/thesaurus.pl" class="submenu">Th?saurus</a> <a href="/cgi-bin/koha/admin/currency.pl" class="submenu2">Devises</a> <a href="/cgi-bin/koha/admin/printers.pl" class="submenu">Imprimantes</a>

  </div>

  <!-- TMPL_IF NAME="loggedinusername" -->


Index: barcodes.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/barcodes.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** barcodes.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- barcodes.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 41,56 ****
  

  <div id="mainbloc">

! 	<h1>G?n?rateur de code-barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G?n?rer le code barre ? partir du num?ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>Select a range of inventary codes. You can select wether a continuous range or individual inventary codes</li>

! 		<li>S?lectionner le de code-barres ? g?n?rer</li>

  		<li>D?finissez la taille de la page pour le PDF</li>

! 		<li>Depending on page size, Koha will show you how the page is arranged

! 		    for each barcode. You can define wich point to start printing the page.

  		</li>

  	</ul>

--- 41,55 ----
  

  <div id="mainbloc">

! 	<h1>G?n?rateur de code ? barres</h1>

  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">G?n?rer le code ? barres ? partir du num?ro d'inventaire</font></td>

  		</tr>

  	</table>

  	<ul>

! 		<li>S?lectionnez une plage pour les num?ros d'inventaire. Vous pouvez s?lectionner une s?rie continue ou une liste de codes disjoints</li>

! 		<li>S?lectionner le style de mod?le pour g?n?rer des codes ? barres</li>

  		<li>D?finissez la taille de la page pour le PDF</li>

! 		<li>Koha va afficher la disposition , qui varie suivant la taille de la page, de tous les codes ? barres.Vous pouvez d?finir ? quel endroit l'impression commence.

  		</li>

  	</ul>

***************
*** 117,121 ****
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code cat?gorie</td>

  						</tr>

  						<tr align="right">

--- 116,120 ----
  					<table style="border:0px">

  						<tr align="right">

! 							<td>Code Pays</td>

  						</tr>

  						<tr align="right">


Index: printerConfig.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/barcodes/printerConfig.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** printerConfig.tmpl	24 Nov 2004 16:13:31 -0000	1.1
--- printerConfig.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 4,8 ****
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4"> S?lectionner la configuration d'imprimante correspondant ? votre environnement</font></td>

  		</tr>

  	</table>

--- 4,8 ----
  	<table bgcolor="#ffcc00" width="80%" cellpadding="3">

  		<tr valign="center">

! 			<td><font size="4">S?lectionner la configuration d'imprimante correspondant ? votre environnement</font></td>

  		</tr>

  	</table>

***************
*** 12,17 ****
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>Set margin left and margin bottom of the page that you are going to use. This parameters will

! 		    help to center the barcodes into the labels.</li>

  	</ul>

  	<br>

--- 12,16 ----
  		<li>Entrez le type de page</li>

  		<li>Entres le nombre de colonnes et de lignes dans votre page</li>

! 		<li>D?finissez les marges gauches et basses pour la page que vous souhaitez utiliser. Ces param?tres aideront ? centrer les codes barres sur les ?tiquettes.</li>

  	</ul>

  	<br>

***************
*** 96,100 ****
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer param?tres">

  				</td>

    			</tr>

--- 95,99 ----
    			<tr valign="top">

    			    <td colspan="8" align="center">

! 					<input type="submit" value="Enregistrer r?glages">

  				</td>

    			</tr>





From tipaul at users.sourceforge.net  Wed Jan  5 15:35:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/authorities authorities.tmpl,1.1,1.2 searchresultlist-auth.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2
Message-ID: <E1CmCGQ-0007Pi-F1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/authorities

Modified Files:
	authorities.tmpl searchresultlist-auth.tmpl 
	searchresultlist.tmpl 
Log Message:
french version for 2.2.0

Index: authorities.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- authorities.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 15,19 ****
  			<input type="button" value="Ajouter une autorit?" onclick="Check(this.form)" accesskey="w" class="button authority">
  		<!-- /TMPL_IF -->
- <!--		<a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
  	</p>
  </div>
--- 15,18 ----
***************
*** 134,139 ****
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 133,138 ----
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign?(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign?s (voir les champs en caract?re gras)");
  		alert(alertString2);
  	} else {

Index: searchresultlist-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist-auth.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist-auth.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 60,64 ****
  			<table>
  				<tr>
! 					<th class="authority">Abr?g?</th>
  					<th class="authority">Utilis?</th>
  					<th class="authority">Le choisir</th>
--- 60,64 ----
  			<table>
  				<tr>
! 					<th class="authority">R?sum?</th>
  					<th class="authority">Utilis?</th>
  					<th class="authority">Le choisir</th>

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/authorities/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:30 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 35,39 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr?g?</th>
  				<th class="authority">Utilis?</th>
  				<th class="authority">Voir</th>
--- 35,39 ----
  		<table>
  			<tr>
! 				<th class="authority">R?sum?</th>
  				<th class="authority">Utilis?</th>
  				<th class="authority">Voir</th>
***************
*** 46,50 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit? num?ro <!--TMPL_VAR" title="Autorit? num?ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 46,50 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit? num?ro <!-- TMPL_VAR NAME="authid" -->' title='autorit? num?ro <!-- TMPL_VAR NAME="authid" -->'>
  						</a>
  					</td>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007QW-GW@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
french version for 2.2.0

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 400.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a ?t? rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 401.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li> Cette erreur signifie que vous n'?tes pas autoris? ? visualiser cette page</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que vous n'?tes pas autoris? ? visualiser cette page</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 402.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a ?t? rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 403.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a ?t? rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 404.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a ?t? rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 405.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,18 ****
  <br>
  
! <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,18 ----
  <br>
  
! <li>Cette erreur signifie que le lien a ?t? rompu et que la page n'existe plus</li>	
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	24 Nov 2004 16:14:39 -0000	1.1
--- 500.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 13,19 ****
  <br>
  
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
  <li>Attendez une meilleure version ou envoyez un mail ? la maintenance</li>
! <li> Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>
--- 13,19 ----
  <br>
  
! <li>Dans Koha, ceci signifie normalement, que l'?quipe de Koha travaille ? de nouvelles options</li>	
  <li>Attendez une meilleure version ou envoyez un mail ? la maintenance</li>
! <li>Utilisez la barre de menu principale pour naviguer ? nouveau dans Koha.</li>
  </ul>
  </div>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/help/bull bull-home.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Q6-3a@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/help/bull

Modified Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
french version for 2.2.0

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- bull-home.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P?riodiques</h1>
! 	<li>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</li>
  	<li>Si vous voulez cr?er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P?riodiques</h1>
! 	<li>Chercher un abonnement en utilisant le bouton (avec un ISSN ou un titre)Si vous saisissez un titre, vous pouvez utiliser le joker % : <b>%Monde%</b> renverra tous les abonnement contenant Monde dans le titre</li>
  	<li>Si vous voulez cr?er un nouvel abonnement, cliquez sur <span class="button">Ajouter un abonnement</span>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,26 ****
  	<p>Cet ?cran est divis? en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
  	<ul>
! 		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
! 		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
! 		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
  	<ul>
! 		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
! 		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
! 		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
! 		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically</li>
! 		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date & end date. This field must be filled manually. Nothing is put here automatically.</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
! 	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget & bookseller are defined here).</p>
! 	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 3,26 ----
  	<p>Cet ?cran est divis? en 2 parties</p>
  	<h2>La partie droite</h2>
! 	<p>La partie droite concerne les parutions.Quand vous cr?er un nouvel abonnement, le 1er num?ro est calcul?e automatiquement.Lorsque vous  voulez/ avez besoin,vous pouvez  d?finir les numeros qui ont un nouveau statut :</p>
  	<ul>
! 		<li>Arriv? : lorqu'un bulletin arrive, vous pouvez le mettre en ?tat"arriv?". Le bulletin disparait de la liste et le num?ro est ajout? dans la liste des bulletins arriv?s (? gauche)</li>
! 		<li>En retard : signifie que le document est en retard et devrait ?tre arriv?.Un num?ro, qui not? ? l'?tat en retard reste dans la liste des bulletins attendus et le  bulletin suivant attendu est g?n?r?</li>
! 		<li>Manquant : signifie que la livraison n'aura jamais lieu.Le num?ro dispara?t de la liste et est ajout? ? la liste "Liste des lacunes" (sur la partie gauche)</li>
  	</ul>
  	<h2>La partie gauche</h2>
! 	<p>Il y a 6 informations diff?rentes dans la partie gauche, qui sont calcul?es automatiquement pour la plupart, mais vous pouvez les changer<p>
  	<ul>
! 		<li>Date de d?but d'abonnement : la date de d?but du premier abonnement.Ne devrait ?tre modifi?e et n'est pas modifi? automatiquement lors du renouvellement des abonnements</li>
! 		<li>date de fin d'abonnement : doit ?tre entr? manuellement lorsque l'abonnement est d?finitivement clos</li>
! 		<li>Num?ros arriv?s : la liste des num?ros que vous avez dans votre biblioth?que. Automatiquement rempli quand un bulletin est marqu? arriv?. Vous pouvez modifier ce champ manuellement, par exemple pour changer une longue liste (1,2,3,4,...,51) en une plus courte(1-50)</li>
! 		<li>Num?ros manquants : la liste des  num?ros que vous n'avez pas dans votre biblioth?que, et qui n'arriveront jamais (ou qui ont ?t? perdus).</li>
! 		<li>note de l'OPAC : le champ qui appara?t ? l'OPAC (avec quelques autres informations sur l'abonnement comme la date de d?but et de fin).Ce champ doit ?tre rempli manuellement.Rien n'est mis ici automatiquement</li>
! 		<li>Note de l'OPAC : le champ qui appara?t dans l'interface biblioth?caire (avec quelques autres informations sur l'abonnement comme la date de d?but et de fin).Ce champ doit ?tre rempli manuellement.Rien n'est mis ici automatiquement</li>
  	</ul>
  	<h2>Renouvellement d'abonnement</h2>
! 	<p>Koha calcule automatiquement la fin de l'abonnement (? partir de la date de d?but et du nombre d'exemplaires re?us). Lorsqu'un abonnement a pris fin, vous ne pouvez plus changer l'?tat du dernier "exemplaire en attente" (car il n'est plus attendu en fait). Pour pouvoir "recevoir" ce num?ro, vous devez renouveler votre abonnement.</p>
! 	<p>Renouveller un abonnement signifie que vous devez compl?ter quelques informations pour le renouvellement.Lorsque ces informations sont saisies, une suggestion est automatiquement cr??e dans Koha.Cette suggestion peut- ?tre g?r?e par la/le biblioth?caire qui commande les livres, comme n'importe quelle autre commande (= budget et fournisseur sont d?finis ici).</p>
! 	<p><i>Noter que le renouvellement de l'abonnement fait par le biblioth?caire responsable des p?riodiques est cens? ?tre imm?diat.Nous avons choisi de rendre Koha aussi simple que possible.En fait, le renouvellement de l'abonnement ne peut pas ?tre imm?diat, mais nous n'avons pas voulu ajouter trop de complications.</i></p>
  	</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 3,19 ****
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv?e</p>
! 		<h2>Dur?? d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num?rotation</h2>
! 		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout? ? XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup?rieur ? : si le chiffre calcul? est sup?rieur ? la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 3,19 ----
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth?caire qui a cr?? l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect?.Comporte aussi le titre de la notice concern?e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv?e</p>
! 		<h2>Dur?e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit ?tre rempli : la dur?e de l'abonnement peut ?tre calcul?e en semaines, mois ou nombre de num?ros ? recevoir</p>
  		<h2>Calcul de la num?rotation</h2>
! 		<p>Le num?ro des bulletins re?us peut ?tre une formule complexe. La formule peut contenir n'importe quel texte et/ou chiffre. <b>{X} {Y}</b> et <b>{Z}</ b> sont particuliers. Vous pouvez les utiliser pour d?finir une formule de calcul. les valeurs de XYZ sont calcul?es de la mani?re suivante :</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout? ? XYZ</li>
! 				<li>toutes les : le nombre avant peut ?tre ajouter ? chaque parution ou moins souvent</li>
  				<li>Quand sup?rieur ? : si le chiffre calcul? est sup?rieur ? la valeur ci</li>
! 				<li>Retourner ? : si la condition pr?c?dente est valid?e, le num?ro calcul? est fix? ? celui-ci ? la place</li>
! 				<li>Derni?re valeur/commence avec : la derni?re valeur calcul?e ou la 1?re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 24,30 ****
  		</ul>
  		Donnera les num?ros de parution suivants
! 		<p>N?2004/1, N?2004/2, N?2004/3, N?2004/4, N?2005/1, N?2005/2, N?2005/3, N?2005/4, N?2006/1</p>
  		<p>
! 			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
--- 24,30 ----
  		</ul>
  		Donnera les num?ros de parution suivants
! 		<p>N?2004/1, N?2004/2, N?2004/3, N?2004/4, N?2005/1, N?2005/2, N?2005/3, N? 2005/4, N?2006/1</p>
  		<p>
! 			<b>Note:</b>lorsque vous ajoutez un abonnement, Koha consid?re que vous avez d?j? pass? la commande o? que vous allez le faire bient?t.Aussi, AUCUNE information n'est envoy?e vers le module acquisition.Ca n'est pas le cas quand l'abonnement arive ? expiration.Dans ce cas,un renouvellement de l'abonnement  cr?e une
  		</p>
  <!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/help/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:15:49 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:19 -0000	1.2
***************
*** 1,20 ****
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P?riodiques d?tail</h1>
! 	In this screen, you can see subscription detail, and modify it if you need.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv?e</p>
! 		<h2>Dur?? d'abonnement</h2>
! 		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
  		<h2>Calcul de la num?rotation</h2>
! 		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout? ? XYZ</li>
! 				<li>once every : the number before can be added on every issue or less often</li>
  				<li>Quand sup?rieur ? : si le chiffre calcul? est sup?rieur ? la valeur ci</li>
! 				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
! 				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
  			</ul>
  		<h2>Echantillon</h2>
--- 1,20 ----
  <!-- TMPL_INCLUDE NAME="help-top.inc" -->
  	<h1>Aide de Abonnement P?riodiques d?tail</h1>
! 	Sur cet ?cran, vous pouvez voir le d?tail de l'abonnement, et le modifier si n?cessaire.
  	<ul>
  		<h2>Bloc d'information d'abonnement</h2>
! 		<p>Comporte le nom du biblioth?caire qui a cr?? l'abonnement, le nom du fournisseur qui procure l'abonnement, le prix et le budget affect?.Comporte aussi le titre de la notice concern?e par l'abonnement</p>
  		<h2>Bloc d'information sur le calendrier</h2>
  		<p>Contient des informations diverses pour calculer les dates d'arriv?e</p>
! 		<h2>Dur?e d'abonnement</h2>
! 		<p>Un champ de ce bloc doit ?tre rempli : la dur?e de l'abonnement peut ?tre calcul?e en semaines, mois ou nombre de num?ros ? recevoir</p>
  		<h2>Calcul de la num?rotation</h2>
! 		<p>La num?rotation des exemplaires re?us peut comprendre une formule complexe. La "Formule de num?rotation" peut ?tre remplie avec n'importe quel texte et/ ou nombre.<b>{X} {Y}</b> et <b>{Z}</b> peuvent ?tre utilis?es pour d?finir la formule de calcul.Les valeurs de XYZ sont calcul?es selon la mani?re suivante</p>
  			<ul>
  				<li>Ajouter: ce nombre est ajout? ? XYZ</li>
! 				<li>toutes les : le nombre avant peut ?tre ajouter ? chaque parution ou moins souvent</li>
  				<li>Quand sup?rieur ? : si le chiffre calcul? est sup?rieur ? la valeur ci</li>
! 				<li>Retourner ? : si la condition pr?c?dente est valid?e, le num?ro calcul? est fix? ? celui-ci ? la place</li>
! 				<li>Derni?re valeur/commence avec : la derni?re valeur calcul?e ou la 1?re (quand on ajoute un abonnement)</li>
  			</ul>
  		<h2>Echantillon</h2>
***************
*** 23,27 ****
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup?rieur ? <b>4</b> Retourner ? <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num?ros de parution suivants
! 			<b>N?2004/1,N?2004/2,N?2004/3,N?2004/4,N?2005/1,N?2005/2,N?2005/3,N?2005/4,N?2006/1
  		<p>
  		</p>
--- 23,27 ----
  			<li> <b>Y</b> ajouter <b>1</b> toutes les <b>1</b> fois.Quand sup?rieur ? <b>4</b> Retourner ? <b>4</b>. Commence par <b>1</b></li>
  			Donnera les num?ros de parution suivants
! 			<b>N?2004/1, N?2004/2, N?2004/3, N?2004/4, N?2005/1, N?2005/2, N?2005/3, N? 2005/4, N?2006/1
  		<p>
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple addbiblio.tmpl,1.12,1.13 addbooks.tmpl,1.5,1.6 additem-nomarc.tmpl,1.3,1.4 additem.tmpl,1.8,1.9 isbnsearch.tmpl,1.4,1.5 marcimport.tmpl,1.4,1.5
Message-ID: <E1CmCGR-0007QJ-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui.simple

Modified Files:
	addbiblio.tmpl addbooks.tmpl additem-nomarc.tmpl additem.tmpl 
	isbnsearch.tmpl marcimport.tmpl 
Log Message:
french version for 2.2.0

Index: addbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbiblio.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** addbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.12
--- addbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.13
***************
*** 57,61 ****
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate"> Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice ? nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> ? partir de cette notice</p>
  				</ul>
--- 57,61 ----
  				<p>Vous devez soit :</p>
  				<ul>
! 					<p><input type="checkbox" value=1 name="confirm_not_duplicate">Confirmer que ce n'est pas un doublon (et cliquer sur Ajouter Notice ? nouveau)</p>
  					<p><a href="additem.pl?bibid=<!-- TMPL_VAR name="duplicatebibid" -->" class="button catalogue">Editer les exemplaires</a> ? partir de cette notice</p>
  				</ul>
***************
*** 455,460 ****
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_(" mandatory tags empty");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	} else {
--- 455,460 ----
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_missing_mandatory_tags +_("Champ(s) obligatoire(s) non renseign?(s)");
! 		alertString2 += "\n- "+ total_missing_mandatory_subfields +_("champs obligatoires non renseign?s (voir les champs en caract?re gras)");
  		alert(alertString2);
  	} else {

Index: addbooks.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/addbooks.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** addbooks.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- addbooks.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 1,5 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv?(s)</font>
--- 1,5 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">Gestion des notices MARC</h1>
  	<!-- TMPL_IF name="noitemsfound" -->
  		<font color="red" size="4">Pas d'exemplaire(s) trouv?(s)</font>
***************
*** 11,21 ****
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="acquisition"> Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button acquisition"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button acquisition">Cr?er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
--- 11,21 ----
  	<div id="bloc25">
  		<form action="isbnsearch.pl">
! 			<h2 class="catalogue">Pour ajouter une nouvelle notice/exemplaire, scannez ou entrez le code ISBN/ ISSN</h2>
  			<p><label class="label20">ISBN</label> <input type="text" name="isbn" /></p>
  			<p><label class="label20">Titre</label> <input type="text" name="title" /></p>
! 			<p><input type="submit" value="Aller" class="button catalogue"></p>
  		</form>
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<p><a href="addbiblio-nomarc.pl" class="button catalogue">Cr?er une nouvelle notice</a></p>
  		<!-- TMPL_ELSE -->
  			<p>
***************
*** 27,40 ****
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr?er une nouvelle notice" class="button acquisition">
! 				</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="acquisition">Optimisation</h2>
! 		<p>If the ISBN or title is found in the biblio table, it will be retrieved and can be modified.<br/>
! 				If the ISBN or title is found in the breeding farm, it will be retrieved and a biblio will be added.<br/>
! 				Sinon, une notice peut-?tre ajout? ? partir de z?ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 27,41 ----
  						<!-- /TMPL_LOOP -->
  					</select>
! 					<input type="submit" value="Cr?er une nouvelle notice" class="button catalogue">
! 				</form>
! 			</p>
  		<!-- /TMPL_IF -->
  	</div>
  	<div id="bloc25">
! 		<h2 class="catalogue">Optimisation</h2>
! 		<p>Si l'ISBN ou le titre est trouv? dans la table il peut ?tre r?cup?r? puis modifi?<br/>
! 				Si l'ISBN ou le titre est trouv? dans le r?servoir, il sera r?cup?r? et une notice sera rajout?e<br/>
! 				Sinon, une notice peut-?tre ajout?e en partant de z?ro.</p>
  	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: additem-nomarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem-nomarc.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** additem-nomarc.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- additem-nomarc.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 5,9 ****
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code barre ? l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
--- 5,9 ----
  		<p>
  		<!-- TMPL_IF NAME="NOBARCODE" -->
! 			<p class="problem">Vous devez attribuer un code ? barres ? l'exemplaire</p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="NOBIBLIOITEM" -->
***************
*** 11,15 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D?sol?, ce code barre est d?j? utilis?</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
--- 11,15 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="BARCODEINUSE" -->
! 			<p class="problem">D?sol?, ce code ? barres est d?j? utilis?</p>
  		<!-- /TMPL_IF -->
  		<h2 class="catalogue">NOTICE <!-- TMPL_VAR NAME="BIBNUM" --></h2>
***************
*** 29,33 ****
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Localisation</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
--- 29,33 ----
  				<p><label>Dewey :</label> <!-- TMPL_VAR NAME="dewey" --></p>
  				<p><label>Editeur :</label> <!-- TMPL_VAR NAME="publishercode" --></p>
! 				<p><label>Emplacement</label> <!-- TMPL_VAR NAME="place" --></p>
  				<p><label>Date</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
  				<!-- TMPL_LOOP NAME="ITEMS -->
***************
*** 44,48 ****
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code Barre de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>
--- 44,48 ----
  		<h2 class="catalogue">AJOUTER UN NOUVEL EXEMPLAIRE</h2>
  		<p><i>Pour un site Web ajouter seulement le groupe</i></p>
! 		<p><label>Code ? Barres de l'exemplaire :</label><input type="text" name="barcode" size="40"></p>
  		<p>
  			<label>Site:</label>

Index: additem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/additem.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** additem.tmpl	24 Nov 2004 16:11:16 -0000	1.8
--- additem.tmpl	5 Jan 2005 14:35:18 -0000	1.9
***************
*** 46,53 ****
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code barre d?j? utilis?!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un ouvrage" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
--- 46,53 ----
  	<input type="hidden" name="itemnum" value="<!-- TMPL_VAR NAME="itemnum" -->">
  	<!-- TMPL_IF name="barcode_not_unique" -->
! 		<div id="problem"><b>ERREUR : Code ? barres d?j? utilis?!<b></div>
  	<!-- /TMPL_IF -->
  	<!-- TMPL_IF name="opisadd" -->
! 	<input type="button" value="Ajouter un document" onclick="Check(this.form)" accesskey="w" class="button catalogue">
  	<!-- TMPL_ELSE -->
  	<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="itemtagfield" -->">
***************
*** 95,99 ****
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
  		alert(alertString2);
  	}
--- 95,99 ----
  		alertString2  = _("Formulaire non soumis ? cause du (des) probl?me(s) suivant(s)");
  		alertString2 += "\n------------------------------------------------------------------------------------\n";
! 		alertString2 += "\n- "+ total_errors+_("champs obligatoires non renseign?s (voir les champs en caract?re gras)");
  		alert(alertString2);
  	}
***************
*** 104,108 ****
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l'ouvrage ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;
--- 104,108 ----
  }
  function confirm_deletion(bibid,itemnum) {
! 	var is_confirmed = confirm(_('Confirmez-vous la suppression de l exemplaire ?'));
  	if (is_confirmed) {
  	window.location = "additem.pl?op=delitem&bibid="+bibid+"&itemnum="+itemnum;

Index: isbnsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/isbnsearch.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** isbnsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- isbnsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 1,7 ****
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">R?sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="acquisition">Vous recherchiez <b><!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></b></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r?ponses</p>
--- 1,7 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="catalogue">R?sultats de la recherche de notice</h1>
  	<div id="bloc25">
! 		<h2 class="catalogue">Vous recherchiez <!-- TMPL_IF name="isbn" -->ISBN <!-- TMPL_VAR NAME="isbn" --><!-- /TMPL_IF --><!-- TMPL_IF name="title" -->titre <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></h2>
  		<!-- TMPL_IF name="total" -->
  			<p><!-- TMPL_VAR NAME="total" --> r?ponses</p>
***************
*** 10,20 ****
  	</div>
  	<div id="bloc100">
! 		<h2 class="acquisition">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="acquisition">Titre</th>
! 				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">&copier;</th>
! 				<th class="acquisition">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
--- 10,20 ----
  	</div>
  	<div id="bloc100">
! 		<h2 class="catalogue">Notices dans Koha</h2>
  		<table>
  			<tr>
! 				<th class="catalogue">Titre</th>
! 				<th class="catalogue">Auteur</th>
! 				<th class="catalogue">&copier;</th>
! 				<th class="catalogue">&nbsp;</th>
  			</tr>
  			<!-- TMPL_IF name="loop" -->
***************
*** 25,31 ****
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ajouter des ouvrages</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button acquisition">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
--- 25,31 ----
  					<td><!-- TMPL_VAR NAME="copyrightdate" --></td>
  					<!-- TMPL_IF NAME="NOTMARC" -->
! 					<td><a href="additem-nomarc.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ajouter des documents</a></td>
  					<!-- TMPL_ELSE -->
! 					<td><a href="addbiblio.pl?oldbiblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue">Ouvrir</a></td>
  					<!-- /TMPL_IF -->
  				</tr>
***************
*** 61,65 ****
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="acquisition">Notices dans le r?servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
--- 61,65 ----
  			<!-- /TMPL_IF -->
  		</p>
! 		<h2 class="catalogue">Notices dans le r?servoir</h2>
  		<!-- TMPL_IF name="breeding_loop" -->
  			<table>
***************
*** 91,97 ****
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button acquisition">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
--- 91,103 ----
  		<p class="center">
  		<!-- TMPL_IF NAME="NOTMARC" -->
! 			<a href="addbiblio-nomarc.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- TMPL_ELSE -->
! 			<select name="frameworkcode">
! 				<option value="">Par d?faut</option>
! 				<!-- TMPL_LOOP NAME="frameworkcodeloop" -->
! 					<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
! 				<!-- /TMPL_LOOP -->
! 			</select>
! 			<a href="addbiblio.pl?isbn=<!-- TMPL_VAR NAME="isbn" -->" class="button catalogue">Ajouter une nouvelle notice</a>
  		<!-- /TMPL_IF -->
  		</p>
***************
*** 99,101 ****
  	
  </div>
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
--- 105,107 ----
  	
  </div>
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui.simple/marcimport.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** marcimport.tmpl	24 Nov 2004 16:11:16 -0000	1.4
--- marcimport.tmpl	5 Jan 2005 14:35:18 -0000	1.5
***************
*** 12,18 ****
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import?s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import? parce que d?j? dans la base de donn?e</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import?,parce que d?j? dans le r?servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> not imported because they seems not to be MARC format (or ISBN/ISSN missing) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait?s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
--- 12,18 ----
  <ul>
  	<p><!-- TMPL_VAR NAME="imported" --> enregistrements import?s</p>
! 	<p><!-- TMPL_VAR NAME="alreadyindb" --> non import? parce que d?j? dans la base de donn?es</p>
  	<p><!-- TMPL_VAR NAME="alreadyinfarm" --> non import?,parce que d?j? dans le r?servoir</p>
! 	<p><!-- TMPL_VAR NAME="notmarcrecord" --> non import? parce qu'ils ne semblent pas ?tre au format MARC (ou n? ISBN/ ISSN manquant) !</p>
  	<p><!-- TMPL_VAR NAME="total" --> enregistrements trait?s</p>
  	<p><a href="addbooks.pl">Retour aux acquisitions</a>
***************
*** 20,27 ****
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>Select a file to import into the breeding farm. It will be parsed, and for each ISBN found, a new baby will be created in the breeding farm.</li>
! 	<li>If an ISBN already exists in the breeding farm, you can choose whether to ignore the new one or overwrite the old one.</li>
! 	<li>You can enter a name for this import. It may be useful, when creating a biblio, to remember where the suggested MARC data comes from!</li>
! 	<li>Of course, if the ISBN already exists in the active DB, the biblio will be ignored.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">
--- 20,27 ----
  <!-- TMPL_ELSE -->
  <ul>
! 	<li>S?lectionner un fichier ? importer dans le r?servoir.Il sera analys?, et pour chaque ISBN trouv?, une nouvelle copie sera cr?? dans le r?servoir.</li>
! 	<li>Si un ISBN existe d?j? dans le r?servoir, vous pouvez choisir soit d'ignorer le nouveau soit d'?craser l'ancien.</li>
! 	<li>Vous pouvez donner un nom ? cette importation. Cela peut ?tre utile, lors de la cr?ation d'une notice, pour vous souvenir d'o? vient l'enregistrement MARC propos?!</li>
! 	<li>Bien s?r, si l'ISBN existe d?j? dans la base de donn?es, la notice sera ignor?e.</li>
  </ul>
  <form method="post" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" enctype="multipart/form-data">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bull receipt-search-result.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search.tmpl,1.1,1.2 searchresultlist.tmpl,1.1,1.2 serial-issues.tmpl,1.1,1.2 statecollection.tmpl,1.1,1.2 subscription-add.tmpl,1.1,1.2 subscription-detail.tmpl,1.1,1.2 subscription-renew.tmpl,1.1,1.2
Message-ID: <E1CmCGR-0007Qg-MN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/bull

Modified Files:
	receipt-search-result.tmpl result.tmpl search.tmpl 
	searchresultlist.tmpl serial-issues.tmpl statecollection.tmpl 
	subscription-add.tmpl subscription-detail.tmpl 
	subscription-renew.tmpl 
Log Message:
french version for 2.2.0

Index: receipt-search-result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/receipt-search-result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** receipt-search-result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- receipt-search-result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 36,40 ****
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit? num?ro <!--TMPL_VAR" title='Num?ro du p?riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>
--- 36,40 ----
  					<td>
  		<div align="center">				<a href="subscription-detail.pl?suscr=<!-- TMPL_VAR name="subscriptionid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit? num?ro <!-- TMPL_VAR name="authid" -->' title='Num?ro du p?riodique <!-- TMPL_VAR name="subscriptionid" -->'>
  						</a> </div>
  					</td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- result.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 			<th class="catalogue">Abr?g?</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
--- 31,35 ----
  		<table>
  			<tr>
! 			<th class="catalogue">R?sum?</th>
  			<th class="catalogue">&nbsp;</th>
  			</tr>
***************
*** 48,56 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
- 					<!-- TMPL_UNLESS NAME="norequests" -->
  						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Le choisir</a>
- 					<!-- TMPL_ELSE -->
- 						Non R?servable
- 					<!-- /TMPL_UNLESS -->
  				</td>
  			</tr>
--- 48,52 ----

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- search.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 11,15 ****
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Mot cl?</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">
--- 11,15 ----
  		<h2 class="catalogue">Rechercher sur</h2>
  		<p>
! 			<label class="label20">Tous les mots</label>
  			<input type="hidden" name="marclist" value="">
  			<input type="hidden" name="and_or" value="and">

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- searchresultlist.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 31,35 ****
  		<table>
  			<tr>
! 				<th class="authority">Abr?g?</th>
  				<th class="authority">Utilis?</th>
  				<th class="authority">Voir</th>
--- 31,35 ----
  		<table>
  			<tr>
! 				<th class="authority">R?sum?</th>
  				<th class="authority">Utilis?</th>
  				<th class="authority">Voir</th>
***************
*** 42,46 ****
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt="Autorit? num?ro <!--TMPL_VAR" title="Autorit? num?ro <!--TMPL_VAR">
  						</a>
  					</td>
--- 42,46 ----
  					<td>
  						<a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
! 							<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" width="32" hspace="0" vspace="0" border="0" alt='Autorit? num?ro <!-- TMPL_VAR name="authid" -->' title='Autorit? num?ro <!-- TMPL_VAR name="authid" -->'>
  						</a>
  					</td>

Index: serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/serial-issues.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** serial-issues.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- serial-issues.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 68,72 ****
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> pr?ts<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->
--- 68,72 ----
  		</p>
  		<p>Abonnement pour 
! 			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> sorties<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> semaines<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> mois<!-- /TMPL_IF -->

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/statecollection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** statecollection.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- statecollection.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 3,32 ****
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour</h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
- 	<h2 class="bull">R?sum? d'abonnement</h2>
- 	<form method="post" name="f" action="statecollection.pl">
- 		<input type="hidden" name="op" value="modsubscriptionhistory">
- 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
- 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
- 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
- 		<p><label>Biblioth?caire</label><!-- TMPL_VAR name="user" --></p>
- 		<p><label>Date de d?but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
- 		<p><label>Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
- 		<p>N? Arriv?s</p>
- 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
- 		<p>Num?ros enregistr?s</p>
- 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
- 		<p>Remarque de l'OPAC</p>
- 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
- 		<p>Note interne</p>
- 		<p>&nbsp;<textarea name="librariannote" COLS=60 ROWS=5><!-- TMPL_VAR name="librariannote" --></textarea></p>
- 		<input type="submit" value="Enregistrer les changements" class="button bull">
- 	</form>
- </div>
- 
- <div id="bloc25">
  <h2 class="bull">Num?ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
--- 3,10 ----
  <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1 class="bull">Abonnement pour <!-- TMPL_VAR name="bibliotitle" --></h1>
  <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Abonnement</a>
  
  <div id="bloc25">
  <h2 class="bull">Num?ros attendus ou en retard</h2>
  	<form method="post" name="f" action="statecollection.pl">
***************
*** 83,92 ****
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>Subscription has expired. Waited last issue status can't be changed. <a href="#" onClick="popup()" class="button bull">Renew</a> your subscription</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! </form>
  </table>
  <script language="JavaScript" type="text/javascript">
--- 61,89 ----
  	<input type="submit" value="Enregistrer les changements" accesskey="w" class="button bull">
  	<!-- TMPL_IF name="hassubscriptionexpired" -->
! 		<p>L'abonnement a expir?.L'?tat du prochain numero attendu ne peut-?tre chang?. <a href="#" onClick="popup()" class="button bull">Renouveller</a>votre abonnement</p>
  	<!-- /TMPL_IF -->
  	</form>
  </div>
  
! <div id="bloc25">
! 	<h2 class="bull">R?sum? d'abonnement</h2>
! 	<form method="post" name="f" action="statecollection.pl">
! 		<input type="hidden" name="op" value="modsubscriptionhistory">
! 		<input type="hidden" name="serial" value="<!-- TMPL_VAR name="serial" -->">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
! 		<p><label>Biblioth?caire</label><!-- TMPL_VAR name="user" --></p>
! 		<p><label class="label100">Date de d?but (*)</label><input type="text" name="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->"></p>
! 		<p><label class="label100">Date de fin</label><input type="text" name="enddate" value="<!-- TMPL_VAR name="enddate" -->"></p>
! 		<p>Bulletins re?us</p>
! 		<p>&nbsp;<textarea name="recievedlist" COLS=60 ROWS=5><!-- TMPL_VAR name="recievedlist" --></textarea></p>
! 		<p>Bulletins manquants</p>
! 		<p>&nbsp;<textarea name="missinglist" COLS=60 ROWS=2><!-- TMPL_VAR name="missinglist" --></textarea></p>
! 		<p>Remarque de l'OPAC</p>
! 		<p>&nbsp;<textarea name="opacnote" COLS=60 ROWS=5><!-- TMPL_VAR name="opacnote" --></textarea></p>
! 		<input type="submit" value="Enregistrer les changements" class="button bull">
! 	</form>
! </div>
! 
  </table>
  <script language="JavaScript" type="text/javascript">

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-add.tmpl	24 Nov 2004 16:13:33 -0000	1.1
--- subscription-add.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 21,26 ****
  		<p class="problem">attention</p>
  		<ul>
! 			<li>remember you <b>must</b> have created a biblio <b>before</b> creating a subscription</li>
! 			<li>You also must have selected a supplier if you want to ask for late issues</li>
  		</ul>
  </div>
--- 21,26 ----
  		<p class="problem">attention</p>
  		<ul>
! 			<li>Souvenez vous que vous <b>devez</b> avoir cr?? une notice <b>avant</b> de cr?er un abonnement</li>
! 			<li>Vous devez s?lectionner un fournisseur si vous souhaitez r?clamer les num?ros en retard</li>
  		</ul>
  </div>
***************
*** 129,133 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur?? d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>
--- 129,133 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur?e d'abonnement</h2>
  	<p>Saisir 1 des champs suivants :</p>
  	<ul>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-detail.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-detail.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 76,80 ****
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur?? d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>
--- 76,80 ----
  </div>
  <div id="bloc25">
! 	<h2 class="bull">Dur?e d'abonnement</h2>
  	<p><label class="label100">Nombre de bulletins</label><!-- TMPL_VAR name="numberlength" --></p>
  	<p><label class="label100">Nombre de semaines</label><!-- TMPL_VAR name="weeklength" --></p>

Index: subscription-renew.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-renew.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-renew.tmpl	24 Nov 2004 16:13:34 -0000	1.1
--- subscription-renew.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 13,17 ****
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p> Remarque pour le biblioth?caire qui va g?rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">
--- 13,17 ----
  		<p><label class="label100">Nombre de semaines</label><input type="text" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></p>
  		<p><label class="label100">Nombre de mois</label><input type="text" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></p>
! 		<p>Remarque pour le biblioth?caire qui va g?rer votre demande de renouvellement</p>
  		<ul><textarea name="note" rows="10" cols="60"></textarea></ul>
  		<input type="submit" value="Demander un renouvellement" class="button bull">




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:56 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/members jmemberentry.tmpl,1.9,1.10 member-flags.tmpl,1.2,1.3 member-password.tmpl,1.5,1.6 member.tmpl,1.10,1.11 memberentry.tmpl,1.12,1.13 members-home.tmpl,1.7,1.8 moremember.tmpl,1.16,1.17 newjmember.tmpl,1.2,1.3 newmember.tmpl,1.2,1.3 readingrec.tmpl,1.5,1.6
Message-ID: <E1CmCGS-0007Qu-35@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/members

Modified Files:
	jmemberentry.tmpl member-flags.tmpl member-password.tmpl 
	member.tmpl memberentry.tmpl members-home.tmpl moremember.tmpl 
	newjmember.tmpl newmember.tmpl readingrec.tmpl 
Log Message:
french version for 2.2.0

Index: jmemberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/jmemberentry.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** jmemberentry.tmpl	24 Nov 2004 16:17:14 -0000	1.9
--- jmemberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.10
***************
*** 74,78 ****
  		</tr>
  		<tr>
! 			<td colspan="5">The 2 following fields are available for your own usage. They can be useful for stat purposes</td>
  		<tr>
  			<td>Champ de tri 1</td>
--- 74,78 ----
  		</tr>
  		<tr>
! 			<td colspan="5">Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent ?tre utiles pour des besoins statistiques.</td>
  		<tr>
  			<td>Champ de tri 1</td>

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- member-flags.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations</div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>
--- 2,6 ----
  <div id="mainbloc">
  	<div id="bloc25">
! 		<div id="bloctitle">Autorisations pour <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></div>
  		<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
  			<input type="hidden" name="member" value=<!-- TMPL_VAR NAME="member" -->>

Index: member-password.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member-password.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** member-password.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- member-password.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 7,11 ****
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				You have entered a UserID that already exists.  Please choose another one.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>
--- 7,11 ----
  			<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->">
  			<!-- TMPL_IF NAME="warn" -->
! 				Vous avez saisi un nom d'utilisateur qui existe d?j?. Merci de choisir un autre nom.<br>
  			<!-- /TMPL_IF -->
  			Nouvel Identifiant Utilisateur : <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->"> <br>

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/member.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** member.tmpl	24 Nov 2004 16:17:14 -0000	1.10
--- member.tmpl	5 Jan 2005 14:35:21 -0000	1.11
***************
*** 43,47 ****
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte
  	<input type="hidden" name="actionType" value="Add">
  	</form>
--- 43,47 ----
  	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
  	<input type="submit" class="button" value="Ajouter une inscription" title="Ajouter une inscription" alt="Ajouter une inscription">
! 	<input type="radio" name="categorycode" value="" checked>Adulte <input type="radio" name="categorycode" value="I" >Organisation
  	<input type="hidden" name="actionType" value="Add">
  	</form>

Index: memberentry.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/memberentry.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** memberentry.tmpl	15 Dec 2004 22:11:52 -0000	1.12
--- memberentry.tmpl	5 Jan 2005 14:35:21 -0000	1.13
***************
*** 2,129 ****
  
  <div id="mainbloc">
!  <!-- TMPL_IF NAME="addAction" -->
!  <h1>
!   Ajouter une inscription
!  </h1>
!  <!-- TMPL_ELSE -->
!  <h1>
!   Mettre ? jour les d?tails-lecteur
!  </h1>
!  <!-- /TMPL_IF -->
! 
!  <!-- TMPL_IF Name="NOK" -->
!   <h1>ERREUR</h1>
!   <div id="problem">
!    <p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK ? nouveau :</p>
!    <!-- TMPL_IF NAME="ERROR_cardnumber" -->
!     Num?ro de Carte<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
!     N? de carte invalide<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_gender" -->
!     Sexe<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_firstname" -->
!     Pr?noms<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_surname" -->
!     Nom de famille<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="aERROR_ddress" -->
!     Rue de l'adresse<br>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ERROR_city" -->
!     Ville (Code Postal)<br>
!    <!-- /TMPL_IF -->
!   </div>
!  <!-- /TMPL_IF -->
!  <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
!   <input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
!   <input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
!   <input type="hidden" name="type" value="borrowers">
!   <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
!   <input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
!   <!-- TMPL_IF NAME="addAction" -->
!    <input type="hidden" name="op" value="add">
!   <!-- TMPL_ELSE -->
!    <input type="hidden" name="op" value="modify">
!   <!-- /TMPL_IF -->
!   <table>
!    <tr>
!     <td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num?ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
!    </tr>
!    <tr>
!     <th colspan="5">DETAILS PERSONNELS DU LECTEUR</th>
!    </tr>
!    <tr>
!     <td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_UNLESS name="institution" --><b> Pr?noms</b><!-- /TMPL_UNLESS --></td>
!     <td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit?</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
!     <td><!-- TMPL_UNLESS name="institution" -->Nom pr?f?rentiel<!-- /TMPL_UNLESS --></td>
!    </tr>
!    <tr>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!     <!-- TMPL_VAR NAME="Mr" -->
!     <select name="title">
!      <option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
!      <option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
!      <option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
!      <option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
!      <option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
!      <option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
!      <option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
!     </select>
!     <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
!     <td>
!      <!-- TMPL_UNLESS name="institution" -->
!       <input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!    </tr>
! 
!    <tr>
!     <td colspan="2">
!     <!-- TMPL_UNLESS name="institution" -->
!      <input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
!     <!-- /TMPL_UNLESS -->
! 
!     </td>
!     <td colspan="2">
!      <!-- TMPL_UNLESS name="institution" -->
!      Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
!      <!-- /TMPL_UNLESS -->
!     </td>
!     <td>
!      Cat?gorie  <!-- TMPL_VAR NAME="catcodepopup" -->
!     </td>
!    </tr>
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <!-- TMPL_VAR NAME="ethcatpopup" -->
!      <td colspan="2">Ethnie</td>
!      <td colspan="2">Note d'ethnie</td>
!     </tr>
!    <!-- /TMPL_IF -->
!    <!-- TMPL_IF NAME="ethcatpopup" -->
!     <tr valign="top" bgcolor="white">
!      <td colspan="2">
!       <!-- TMPL_IF NAME="ethcatpopup" -->
!        <select name="ethnicity" size="1">
!         <!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
--- 2,129 ----
  
  <div id="mainbloc">
! 	<!-- TMPL_IF NAME="addAction" -->
! 	<h1>
! 		Ajouter <!-- TMPL_IF NAME="institution" -->Nom de la Collectivit? <!-- /TMPL_IF -->Lecteur
! 	</h1>
! 	<!-- TMPL_ELSE -->
! 	<h1>
! 		Mettre ? jour les d?tails-lecteur
! 	</h1>
! 	<!-- /TMPL_IF -->
! 
! 	<!-- TMPL_IF Name="NOK" -->
! 		<h1>ERREUR</h1>
! 		<div id="problem">
! 			<p>Les champs suivants ont des valeurs interdites. Corrigez les et tapez OK ? nouveau :</p>
! 			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
! 				Num?ro de Carte<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
! 				N? de carte invalide<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_gender" -->
! 				Sexe<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_firstname" -->
! 				Pr?noms<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_surname" -->
! 				Nom de famille<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="aERROR_ddress" -->
! 				Rue de l'adresse<br>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ERROR_city" -->
! 				Ville (Code Postal)<br>
! 			<!-- /TMPL_IF -->
! 		</div>
! 	<!-- /TMPL_IF -->
! 	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
! 		<input type="hidden" name="joining" value="<!-- TMPL_VAR NAME="dateenrolled" -->">
! 		<input type="hidden" name="expiry" value="<!-- TMPL_VAR NAME="expiry" -->">
! 		<input type="hidden" name="type" value="borrowers">
! 		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->">
! 		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->">
! 		<!-- TMPL_IF NAME="addAction" -->
! 			<input type="hidden" name="op" value="add">
! 		<!-- TMPL_ELSE -->
! 			<input type="hidden" name="op" value="modify">
! 		<!-- /TMPL_IF -->
! 		<table>
! 			<tr>
! 				<td colspan="5">Lecteur# <!-- TMPL_VAR NAME="member" -->, Num?ro de carte* <input type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"></td>
! 			</tr>
! 			<tr>
! 				<th colspan="5">NOUVEAU LECTEUR <!-- TMPL_UNLESS name="institution" -->DETAILS PERSONNELS<!-- /TMPL_UNLESS --> DETAILS DU CONTACT</th>
! 			</tr>
! 			<tr>
! 				<td><!-- TMPL_UNLESS name="institution" -->Titre de politesse<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Initiales<!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_UNLESS name="institution" --><b> Pr?noms</b><!-- /TMPL_UNLESS --></td>
! 				<td><!-- TMPL_IF NAME="institution" --><b>Nom de la Collectivit?</b><!-- TMPL_ELSE --><b> Nom de famille*</b><!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_UNLESS name="institution" -->Nom usuel<!-- /TMPL_UNLESS --></td>
! 			</tr>
! 			<tr>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 				<!-- TMPL_VAR NAME="Mr" -->
! 				<select name="title">
! 					<option <!-- TMPL_VAR NAME="title_selected_ " --> value=" ">Pas de Titre</option>
! 					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Melle</option>
! 					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mme</option>
! 					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Mme</option>
! 					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >M.</option>
! 					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
! 					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Monsieur</option>
! 				</select>
! 				<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td><input type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td>
! 				<td>
! 					<!-- TMPL_UNLESS name="institution" -->
! 						<input type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td colspan="2">
! 				<!-- TMPL_UNLESS name="institution" -->
! 					<input type="radio" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked<!-- /TMPL_IF -->>F  <input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked<!-- /TMPL_UNLESS -->> M
! 				<!-- /TMPL_UNLESS -->
! 
! 				</td>
! 				<td colspan="2">
! 					<!-- TMPL_UNLESS name="institution" -->
! 					Date de naissance (<!-- TMPL_VAR NAME="dateformat" -->)<input type="text" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->">
! 					<!-- /TMPL_UNLESS -->
! 				</td>
! 				<td>
! 					Categorie <!-- TMPL_VAR NAME="catcodepopup" -->
! 				</td>
! 			</tr>
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<!-- TMPL_VAR NAME="ethcatpopup" -->
! 					<td colspan="2">Ethnie</td>
! 					<td colspan="2">Note d'ethnie</td>
! 				</tr>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="ethcatpopup" -->
! 				<tr valign="top" bgcolor="white">
! 					<td colspan="2">
! 						<!-- TMPL_IF NAME="ethcatpopup" -->
! 							<select name="ethnicity" size="1">
! 								<!-- TMPL_LOOP NAME="ethnicityloop" -->
  								<option value=<!-- TMPL_VAR NAME="value" --><!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="label" -->
  								<!-- /TMPL_LOOP -->
***************
*** 164,168 ****
  
  			<tr>
! 				<td colspan="2">Adresse municipale, si diff?rente</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
--- 164,168 ----
  
  			<tr>
! 				<td colspan="2">Autre adresse</td>
  				<td>&nbsp;</td>
  				<td>&nbsp;</td>
***************
*** 208,212 ****
  
  			<tr>
! 				<td colspan="3">Full Name</td>
  				<td>T?l?phone</td>
  					<td>Relation</td>
--- 208,212 ----
  
  			<tr>
! 				<td colspan="3">Nom</td>
  				<td>T?l?phone</td>
  					<td>Relation</td>
***************
*** 239,243 ****
  			</tr>
  			<tr>
! 				<td>Note de circulation (appara?t durant le pr?t/retour)</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
--- 239,243 ----
  			</tr>
  			<tr>
! 				<td>Note de pr?t (appara?t pendant les sortie/retour</td>
  				<td colspan="4"><textarea name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td>
  			</tr>
***************
*** 258,276 ****
  				<td>Champ de tri 1</td>
  				<td colspan="4">
!      <input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
!     </td>
!    </tr>
!    <tr>
!     <td>Champ de tri 2</td>
!     <td colspan="4">
!      <input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
!     </td>
!    </tr>
! 
!    <tr>
!     <td></td>
!     <td>
!      <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
!      <input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>
--- 258,276 ----
  				<td>Champ de tri 1</td>
  				<td colspan="4">
! 					<input type="text" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
! 				</td>
! 			</tr>
! 			<tr>
! 				<td>Champ de tri 2</td>
! 				<td colspan="4">
! 					<input type="text" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
! 				</td>
! 			</tr>
! 
! 			<tr>
! 				<td></td>
! 				<td>
! 					<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
! 					<input type="reset" value="Effacer tous les champs" class="button">
  					<input type="submit" value="Enregistrer" class="button">
  				</td>

Index: members-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/members-home.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** members-home.tmpl	24 Nov 2004 16:17:14 -0000	1.7
--- members-home.tmpl	5 Jan 2005 14:35:21 -0000	1.8
***************
*** 8,17 ****
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Renew Items, view add, modify and delete records, all by starting with this search.</p>
! 		<p>Type a borrower name, part of a name, or number in the field above and hit the enter key to activate search</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Parcourir les Membres</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||
--- 8,17 ----
  		<input type="text" size="50" name="member" >
  		<input type="submit" class="button" value="OK">
! 		<p>Prolonger des pr?ts, visualiser,ajouter, modifier, supprimer des enregistrements,tout cela en commen?ant par cette recherche</p>
! 		<p>Saisissez le nom du lecteur, une partie du nom, ou un code num?rique dans le champ ci-dessus et appuyez sur la touche Entr?e pour lancer la recherche</p>
  	</form>
  </div>
  <div id="bloc25">
! 			<div class="bloctitle">Naviguer dans les lecteurs</div>
  			<a href="/cgi-bin/koha/members/member.pl?member=a">A</a> ||
  			<a href="/cgi-bin/koha/members/member.pl?member=b">B</a> ||

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/moremember.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** moremember.tmpl	24 Nov 2004 16:17:14 -0000	1.16
--- moremember.tmpl	5 Jan 2005 14:35:21 -0000	1.17
***************
*** 8,12 ****
  		<p>Num?ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" -->: ,  <br>
  		T?l?phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T?l?phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
--- 8,12 ----
  		<p>Num?ro de Carte : <!-- TMPL_VAR NAME="cardnumber" --><br>
  		Adresse Postale: <!-- TMPL_VAR NAME="streetaddress" -->, <!-- TMPL_VAR NAME="zipcode" --> <!-- TMPL_VAR NAME="city" --><br>
! 		<!-- TMPL_UNLESS name="I" -->Adresse domicile : <!-- TMPL_VAR NAME="physstreet" -->, <!-- TMPL_VAR NAME="homezipcode" --> <!-- TMPL_VAR NAME="streetcity" --><br>
  		T?l?phone Domicile : <!-- TMPL_VAR NAME="phone" --><br><!-- /TMPL_UNLESS -->
  		T?l?phone travail : <!-- TMPL_VAR NAME="phoneday" --><br>
***************
*** 26,30 ****
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe<br>
  			Autre
  		<!-- /TMPL_UNLESS -->
--- 26,30 ----
  		<!-- TMPL_UNLESS name="I" -->
  			D.nais:<!-- TMPL_VAR NAME="dateofbirth" --><br>
! 			Sexe <!-- TMPL_VAR NAME="sex" --><br>
  			Autre
  		<!-- /TMPL_UNLESS -->
***************
*** 165,169 ****
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Droits de pr?t</th>
  				<th>Renouvellement</th>
  			</tr>
--- 165,169 ----
  				<th>Retour</th>
  				<th>Type de document</th>
! 				<th>Frais</th>
  				<th>Renouvellement</th>
  			</tr>

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newjmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newjmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newjmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 2,6 ****
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 		<!-- TMPL_VAR NAME="string" -->
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
--- 2,13 ----
  <div id="mainbloc">
  	<!-- TMPL_IF Name="NOK" -->
! 	<h3>Les champs suivants sont incorrects. Cliquez sur "retour" et corrigez les.</h3>
! 	<ul>
! 		<!-- TMPL_IF NAME="cardnumber_missing" --><li>Merci d'entrer le num?ro de carte lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="firstname_missing" --><li>Merci d'entrer le nom du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="surname_missing" --><li>Merci d'entrer le pr?nom du lecteur.</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="dob_missing" --><li>Merci de saisir la date de naissance du lecteur</li><!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="gender_missing" --><li>Merci d'entrer le sexe du lecteur.</li><!-- /TMPL_IF -->
! 	</ul>
  	<!-- TMPL_ELSE -->
  		<h1> Confirmer l'enregistrement </h1>
***************
*** 42,45 ****
--- 49,60 ----
  					<tr valign="top" bgcolor="white" >
  						<td>
+ 						<b>Barcode Number</b>
+ 						</td>
+ 						<td>
+ 						<!-- TMPL_VAR NAME="cardchild" -->
+ 						</td>
+ 					</tr>					
+ 					<tr valign="top" bgcolor="white" >
+ 						<td>
  						<b>Date de naissance</b>
  						</td>

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/newmember.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newmember.tmpl	24 Nov 2004 16:17:14 -0000	1.2
--- newmember.tmpl	5 Jan 2005 14:35:21 -0000	1.3
***************
*** 228,232 ****
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>The following fields have a forbidden value. Please push the back button and try again : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num?ro de Carte<br/>
--- 228,232 ----
  <!-- TMPL_ELSE -->
  	<h1>ERREUR</h1>
! 	<p>Les champs suivants ont des valeurs interdites. Merci de cliquer sur le bouton retour et de r?essayer : </p>
  	<!-- TMPL_IF NAME="cardnumber" -->
  		Num?ro de Carte<br/>

Index: readingrec.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/members/readingrec.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** readingrec.tmpl	24 Nov 2004 16:17:14 -0000	1.5
--- readingrec.tmpl	5 Jan 2005 14:35:21 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  	
  	<!-- TMPL_IF NAME="showfulllink" -->
+ 	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=50">Voir les 50 derniers seulement</a></p><!-- TMPL_ELSE -->
  	<p><a href="readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;limit=full">Sortie compl?te</a></p>
  	<!-- /TMPL_IF -->




From tipaul at users.sourceforge.net  Wed Jan  5 15:35:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:35:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/acqui acqui-home.tmpl,1.5,1.6 acquire.tmpl,1.3,1.4 basket.tmpl,1.7,1.8 histsearch.tmpl,1.1,1.2 newbasket2.tmpl,1.6,1.7 newbiblio.tmpl,1.7,1.8 recieve.tmpl,1.3,1.4 suggestion-select.tmpl,1.1,1.2 supplier.tmpl,1.6,1.7
Message-ID: <E1CmCGR-0007Qk-OI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28050/koha-tmpl/intranet-tmpl/default/fr/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl histsearch.tmpl 
	newbasket2.tmpl newbiblio.tmpl recieve.tmpl 
	suggestion-select.tmpl supplier.tmpl 
Log Message:
french version for 2.2.0

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acqui-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acqui-home.tmpl	24 Nov 2004 16:11:16 -0000	1.5
--- acqui-home.tmpl	5 Jan 2005 14:35:18 -0000	1.6
***************
*** 39,43 ****
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets</h2>
  		<table class="noborder">
  			<tr>
--- 39,43 ----
  <div id="bloc25">
  	<form action="/cgi-bin/koha/search.pl">
! 		<h2 class="acquisition">budgets et lignes de cr?dit</h2>
  		<table class="noborder">
  			<tr>
***************
*** 66,70 ****
  		</table>
  		<p>
! 		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  		</p>
  	</form>
--- 66,70 ----
  		</table>
  		<p>
! 		Utilisez le bouton rafra?chir pour avoir les chiffres les plus r?cents.Les chiffres communiqu?s le sont ? titre indicatif, dans la mesure o? des taux de change affecteront le montant r?ellement pay?.
  		</p>
  	</form>
***************
*** 74,81 ****
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</p>
! 		<p>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </p>
! 		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.</p>
! 		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
  	</ul>
  </div>
--- 74,81 ----
  	<h2 class="acquisition">AIDE Commande</h2>
  	<ul>
! 		<p>Pour d?buter une acquisition, que ?a soit une commande, un achat direct ou un don, rechercher tout d'abord le fournisseur, Ajoutez en un si n?cessaire.</p>
! 		<p>Puis s?lectionnez un panier d'achat pr?c?dent ou cr?ez en un nouveau. Notez que le panier d'achat sera attach? ? l'utilisateur sous lequel vous ?tes logg?. </p>
! 		<p>Pour commander un document vous avez besoin de d?terminer si une notice existe d?j?, puis soit ajouter un exemplaire, soit cr?er une nouvelle notice et y ajouter l'exemplaire</p>
! 		<p>Pour fermer un panier de commande cliquez sur "voir les paniers de commande "ou cherchez en dessus, et cliquez alors sur "confirmer le panier".</p>
  	</ul>
  </div>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/acquire.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acquire.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- acquire.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 35,39 ****
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p> Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
--- 35,39 ----
  				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
! 			<p>Entrer un(des) codes-barre et un site, si vous souhaitez ajouter un(des) exemplaires maintenant</p>
  			<p>
  				<label class="label100">Site</label>
***************
*** 41,45 ****
  			</p>
  			<p>
! 				<label class="label100">Code Barre de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
--- 41,45 ----
  			</p>
  			<p>
! 				<label class="label100">Code ? Barres de l'exemplaire *</label>
  				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
***************
*** 48,52 ****
  			<h2 class="acquisition">D?tails de comptabilit?</h2>
  			<p>
! 				<label class="label100">Budget</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
--- 48,52 ----
  			<h2 class="acquisition">D?tails de comptabilit?</h2>
  			<p>
! 				<label class="label100">Ligne de cr?dit</label>
  				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
***************
*** 70,74 ****
  			<p>
  				<label class="label100">Co?t r?el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
  			</p>
  			<p>
--- 70,74 ----
  			<p>
  				<label class="label100">Co?t r?el *</label>
! 				<input type="text" size="20" name="cost" value="<!-- TMPL_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
  			</p>
  			<p>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/basket.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** basket.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- basket.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 28,32 ****
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">rrp</th>
  				<th class="acquisition">estim?</th>
  				<th class="acquisition">QT?</th>
--- 28,32 ----
  				<th class="acquisition">Titre</th>
  				<th class="acquisition">Auteur</th>
! 				<th class="acquisition">HT</th>
  				<th class="acquisition">estim?</th>
  				<th class="acquisition">QT?</th>
***************
*** 39,43 ****
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
--- 39,47 ----
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
  					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<!-- TMPL_IF name="closedate" -->
! 						<td><!-- TMPL_VAR NAME="title" --></td>
! 					<!-- TMPL_ELSE -->
! 						<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>

Index: histsearch.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/histsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** histsearch.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- histsearch.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Ordre des r?ponses</h1>
  	<table>
  		<tr>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Recherche sur les commandes</h1>
  	<table>
  		<tr>

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbasket2.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbasket2.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- newbasket2.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat pour <!-- TMPL_VAR name="basketno" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>
--- 1,5 ----
  <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Panier d'achat <!-- TMPL_VAR name="basketno" --> pour <!-- TMPL_VAR NAME="bookselname" --></h1>
  		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Ajouter une nouvelle notice"></a>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/newbiblio.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbiblio.tmpl	24 Nov 2004 16:11:16 -0000	1.7
--- newbiblio.tmpl	5 Jan 2005 14:35:18 -0000	1.8
***************
*** 74,78 ****
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp?cifier ? partir d'une suggestion<!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
--- 74,78 ----
  			Nouvelle commande
  		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->sp?cifi? ? partir de la suggestion #<!-- TMPL_VAR NAME="suggestionid" --><!-- /TMPL_IF -->
  	</h1>
  	Panier d'Achat pour <!-- TMPL_VAR NAME="name" -->
***************
*** 81,97 ****
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<input type="text" size="30" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" >
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
  		</p>
  		<p>
--- 81,113 ----
  		<p>
  			<label class="label100"><b>Titre *</b></label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Auteur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100"> Editeur</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">Date de copyright</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 101,109 ****
  		<p>
  			<label class="label100">ISBN</label>
! 			<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
  		</p>
  		<p>
  			<label class="label100">P?riodique</label>
! 			<input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
  		</p>
  		<p>
--- 117,133 ----
  		<p>
  			<label class="label100">ISBN</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
  			<label class="label100">P?riodique</label>
! 			<!-- TMPL_IF name="biblio" -->
! 				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
! 			<!-- TMPL_ELSE -->
! 				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
! 			<!-- /TMPL_IF -->
  		</p>
  		<p>
***************
*** 119,123 ****
  		</p>
  		<p>
! 			<label class="label100">Budget</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
--- 143,147 ----
  		</p>
  		<p>
! 			<label class="label100">Ligne de cr?dit</label>
  			<!-- TMPL_VAR NAME="CGIbookfund" -->
  		</p>
***************
*** 153,157 ****
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>
--- 177,181 ----
  			<input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->">
  		</p>
! 		<p>Les deux champs suivants sont disponibles pour votre usage propre. Ils peuvent ?tre utiles pour des besoins statistiques.</p>
  		<p>
  			<label class="label100">Champ de tri 1</label>

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/recieve.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** recieve.tmpl	24 Nov 2004 16:11:16 -0000	1.3
--- recieve.tmpl	5 Jan 2005 14:35:18 -0000	1.4
***************
*** 66,70 ****
  			<b>AIDE</b>
  			<br>
! 			The total at the bottom of the page should be within a few cents of the total for the invoice.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>
--- 66,70 ----
  			<b>AIDE</b>
  			<br>
! 			Le total en bas de la page devra ?tre proche de quelques centimes du total de la facture.<p>
  			Lorsque vous aurez fini cette facture, sauvez les modifications.
  			</td>

Index: suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/suggestion-select.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** suggestion-select.tmpl	24 Nov 2004 16:11:16 -0000	1.1
--- suggestion-select.tmpl	5 Jan 2005 14:35:18 -0000	1.2
***************
*** 30,34 ****
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann?e de copyright <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
--- 30,34 ----
  					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
  					<p>
! 						<!-- TMPL_IF name="copyrightdate" -->Ann?e de copyright <!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="volumedesc" -->volume : <i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
  						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/acqui/supplier.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** supplier.tmpl	24 Nov 2004 16:11:16 -0000	1.6
--- supplier.tmpl	5 Jan 2005 14:35:18 -0000	1.7
***************
*** 104,108 ****
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des ouvrages incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>
--- 104,108 ----
  		</p>
  		<p>
! 			<label class="label100">Liste des prix des documents incluant la TVA</label>
  				<input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Oui <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>Non
  		</p>




From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/barcodes - New directory
Message-ID: <E1CmCHf-0007Xx-MQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/barcodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/barcodes added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/authorities - New directory
Message-ID: <E1CmCHf-0007Xu-LB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/authorities added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/help - New directory
Message-ID: <E1CmCHg-0007YJ-4i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/help added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bookshelves - New directory
Message-ID: <E1CmCHf-0007Y1-QF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bookshelves

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bookshelves added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/suggestion - New directory
Message-ID: <E1CmCHg-0007YV-6z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/suggestion added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/z3950 - New directory
Message-ID: <E1CmCHg-0007YY-9e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/z3950

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/z3950 added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/errors - New directory
Message-ID: <E1CmCHf-0007YB-Vd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/errors added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:11 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/bull - New directory
Message-ID: <E1CmCHf-0007Y5-SN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/bull added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:37:12 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:37:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/es/import - New directory
Message-ID: <E1CmCHg-0007YR-5p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28979/koha-tmpl/intranet-tmpl/default/es/import

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/es/import added to the repository





From tipaul at users.sourceforge.net  Wed Jan  5 15:41:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:41:53 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.5,1.6 default_intranet_fr_FR.po,1.4,1.5
Message-ID: <E1CmCMD-0007mZ-T4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29858/misc/translator/po

Modified Files:
	css_opac_fr_FR.po default_intranet_fr_FR.po 
Log Message:


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** css_opac_fr_FR.po	8 Dec 2004 10:36:03 -0000	1.5
--- css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
***************
*** 36,40 ****
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s livres)"
  
  #. %1$s: TMPL_VAR name=title 
--- 36,40 ----
  #, c-format
  msgid "%s (%s books)"
! msgstr "%s (%s documents)"
  
  #. %1$s: TMPL_VAR name=title 
***************
*** 49,53 ****
  #, c-format
  msgid "%s (hm)"
! msgstr "%s (maison)"
  
  #. For the first occurrence, 
--- 49,53 ----
  #, c-format
  msgid "%s (hm)"
! msgstr "%s(domicile)"
  
  #. For the first occurrence, 
***************
*** 110,114 ****
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s livres)"
  
  #. %1$s: TMPL_VAR name=author 
--- 110,114 ----
  #, c-format
  msgid "%s(%s books)"
! msgstr "%s(%s documents)"
  
  #. %1$s: TMPL_VAR name=author 
***************
*** 145,149 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "<<Pr?d?cent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
--- 145,149 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:117
  msgid "&lt;&lt;Previous"
! msgstr "Pr?c?dent"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:34
***************
*** 266,270 ****
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour avoir des fonctionnalit?s personnelles"
  
  #. %1$s: TMPL_VAR name=issues 
--- 266,270 ----
  #, c-format
  msgid "<a1>Log in to Koha</a> to have personal options."
! msgstr "<a1>S'identifier</a> pour acc?der ? votre dossier personnel"
  
  #. %1$s: TMPL_VAR name=issues 
***************
*** 272,276 ****
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 272,276 ----
  #, c-format
  msgid "<b><a1>Total Issues:</a></b> %s"
! msgstr "<b>Total des pr?ts:</b> %s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 278,282 ****
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Autre auteur :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
--- 278,282 ----
  #, c-format
  msgid "<b>Additional Author:</b>%s"
! msgstr "<b>Auteur secondaire :</b>%s"
  
  #. %1$s: TMPL_VAR name=additional 
***************
*** 284,288 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Autres auteurs :</b>%s"
  
  #. For the first occurrence, 
--- 284,289 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
***************
*** 340,344 ****
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
--- 341,345 ----
  #, c-format
  msgid "<b>Current Branch:</b> %s"
! msgstr "<b>Site actuel :</b> %s"
  
  #. %1$s: TMPL_VAR name=publicationyear 
***************
*** 346,350 ****
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
--- 347,351 ----
  #, c-format
  msgid "<b>Date:</b> %s"
! msgstr "<b>Date de publication :</b> %s"
  
  #. %1$s: TMPL_VAR name=dewey 
***************
*** 370,374 ****
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
--- 371,375 ----
  #, c-format
  msgid "<b>Home Branch:</b> %s"
! msgstr "</b> %s'><b>Site d'origine:</b> %s"
  
  #. %1$s: TMPL_VAR name=isbn 
***************
*** 390,394 ****
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 391,395 ----
  #, c-format
  msgid "<b>Illus:</b> %s"
! msgstr "<b>Illus:</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 402,406 ****
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b>Type de document : </b>%s"
  
  #. %1$s: TMPL_VAR name=itemtype 
--- 403,407 ----
  #, c-format
  msgid "<b>Item lost:</b> %s"
! msgstr "<b> Document perdu :</b> %s"
  
  #. %1$s: TMPL_VAR name=itemtype 
***************
*** 422,426 ****
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=card1 
--- 423,427 ----
  #, c-format
  msgid "<b>Last Borrower 1:</b> %s"
! msgstr "<b>Dernier emprunteur 1:</b> %s "
  
  #. %1$s: TMPL_VAR name=card1 
***************
*** 428,432 ****
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=timestamp0 
--- 429,433 ----
  #, c-format
  msgid "<b>Last Borrower 2:</b> %s"
! msgstr "<b>Dernier emprunteur 2:</b> %s "
  
  #. %1$s: TMPL_VAR name=timestamp0 
***************
*** 434,438 ****
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=datelastseen 
--- 435,439 ----
  #, c-format
  msgid "<b>Last borrowed:</b> %s"
! msgstr "<b>Dernier emprunteur :</b> %s "
  
  #. %1$s: TMPL_VAR name=datelastseen 
***************
*** 440,444 ****
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
--- 441,445 ----
  #, c-format
  msgid "<b>Last seen:</b> %s"
! msgstr "<b>Vu le :</b> %s"
  
  #. %1$s: TMPL_VAR name=loanlength 
***************
*** 446,450 ****
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
--- 447,451 ----
  #, c-format
  msgid "<b>Loan Length:</b> %s"
! msgstr "<b>Dur?e du pr?t:</b> %s"
  
  #. %1$s: TMPL_VAR name=count 
***************
*** 452,456 ****
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. For the first occurrence, 
--- 453,457 ----
  #, c-format
  msgid "<b>No. of Items:</b> %s"
! msgstr "</b> %s'><b>Nbre. d'exemplaires:</b> %s"
  
  #. For the first occurrence, 
***************
*** 468,472 ****
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
--- 469,473 ----
  #, c-format
  msgid "<b>Pages:</b> %s"
! msgstr "<b>Pages:</b> %s"
  
  #. %1$s: TMPL_VAR name=paidfor 
***************
*** 474,478 ****
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
--- 475,479 ----
  #, c-format
  msgid "<b>Paid for:</b> %s"
! msgstr "<b>Pay? pour:</b> %s"
  
  #. %1$s: TMPL_VAR name=place 
***************
*** 480,484 ****
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
--- 481,485 ----
  #, c-format
  msgid "<b>Place:</b> %s"
! msgstr "<b>Emplacement:</b> %s"
  
  #. %1$s: TMPL_VAR name=publishercode 
***************
*** 492,496 ****
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>publi? par :</b>%s"
  
  #. %1$s: TMPL_VAR name=renewals 
--- 493,497 ----
  #, c-format
  msgid "<b>Publisher:</b> %s"
! msgstr "<b>Editeur:</b> %s"
  
  #. %1$s: TMPL_VAR name=renewals 
***************
*** 498,502 ****
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Remarques:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
--- 499,503 ----
  #, c-format
  msgid "<b>Renewals:</b> %s"
! msgstr "<b>Renouvellements:</b> %s"
  
  #. %1$s: TMPL_VAR name=rentalcharge 
***************
*** 504,508 ****
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Auteur :</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
--- 505,509 ----
  #, c-format
  msgid "<b>Rental Charge:</b> %s"
! msgstr "<b>Frais de location:</b> %s"
  
  #. %1$s: TMPL_VAR name=replacementprice 
***************
*** 510,514 ****
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Collection:</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
--- 511,515 ----
  #, c-format
  msgid "<b>Replacement Price:</b> %s"
! msgstr "<b>Prix de Remplacement :</b> %s"
  
  #. %1$s: TMPL_VAR name=serial 
***************
*** 516,520 ****
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Serial:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
--- 517,521 ----
  #, c-format
  msgid "<b>Serial:</b>%s"
! msgstr "<b>Colection:</b>%s"
  
  #. %1$s: TMPL_VAR name=size 
***************
*** 741,745 ****
  #, c-format
  msgid "BARCODE %s"
! msgstr "code barre %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
--- 742,746 ----
  #, c-format
  msgid "BARCODE %s"
! msgstr "CODE A BARRES %s"
  
  #. %1$s: TMPL_VAR name=biblionumber 
***************
*** 751,760 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour ? la biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "code barre"
  
  #. SCRIPT 
--- 752,761 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:5
  msgid "Back to biblio"
! msgstr "Retour ? la notice"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:57 
  #
  msgid "Barcode"
! msgstr "Code ? barres"
  
  #. SCRIPT 
***************
*** 772,788 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de Biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Rayons"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Annexe"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Annexes"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
--- 773,789 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:39
  msgid "Biblio basket"
! msgstr "Panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:67
  msgid "Bookshelves"
! msgstr "Etag?res"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:52
  msgid "Branch"
! msgstr "Site"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:124
  msgid "Branches"
! msgstr "Sites"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:74
***************
*** 959,963 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filter sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 960,964 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "Filtrer sur"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Aide"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
--- 987,991 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:118
  msgid "Hints"
! msgstr "Conseils"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:33
***************
*** 1019,1023 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % ? la fin du mot. Par exemple, \"deux tours\" retournera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1020,1024 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:128
  msgid "If you want to enter a partial word, add a * or a % at the end of the word. For example \"two tower*\" will retrieve \"the two towers\", \"two white towers\", \"a tower and two cities\""
! msgstr "Si vous voulez entrer une partie de mot, mettez une * ou un % ? la fin du mot. Par exemple, \"deux tours\" donnera \"Les deux tours\" mais aussi \"Une tour et deux maisons\""
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1035,1039 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Bulletins"
  
  #. %1$s: TMPL_VAR name=startdate 
--- 1036,1040 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:77
  msgid "Issues summary"
! msgstr "Abr?g? des num?ros"
  
  #. %1$s: TMPL_VAR name=startdate 
***************
*** 1041,1066 ****
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D?butant le <b>%s</b> et un num?ro chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "documents"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
--- 1042,1067 ----
  #, c-format
  msgid "It began on <b>%s</b> and is issued every <b>"
! msgstr "D?butant le <b>%s</b> et paraissant chaque<b>"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:99
  msgid "Item"
! msgstr "Exemplaire"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:45
  msgid "Item Count"
! msgstr "Nombre d'exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:29 
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:44
  msgid "Item Type"
! msgstr "Type de document"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:66
  msgid "Item barcode"
! msgstr "Code ? barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-MARCdetail.tmpl:226
  msgid "Items"
! msgstr "Exemplaires"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:56
***************
*** 1344,1348 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "ann?e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
--- 1345,1349 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:14
  msgid "Publication year"
! msgstr "Ann?e de Publication"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:45
***************
*** 1375,1379 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Command? par la biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
--- 1376,1380 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:121
  msgid "Recieved by the library"
! msgstr "Re?u par la biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:72 
***************
*** 1475,1479 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S?lectionnez une annexe si vous voulez limiter votre recherche ? une annexe sp?cifique. Par d?faut, la recherche sera faite sur toutes les annexes de la biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
--- 1476,1480 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:125
  msgid "Select a branch if you want to limit your search to items in a specific branch. By default the search is done on every branches of the library"
! msgstr "S?lectionnez une annexe si vous voulez limiter votre recherche ? un site ne particulier. Par d?faut, la recherche sera faite sur tous les sites de la biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-menu.inc:8 
***************
*** 1523,1527 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D?sol?, Koha ne pense pas que vous pouvez acc?der ? cette page"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
--- 1524,1528 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:5
  msgid "Sorry, KOHA doesnt think you have permission for this page."
! msgstr "D?sol?, Koha pense que vous ne pouvez pas acc?der ? cette page."
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:131
***************
*** 1577,1581 ****
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information de souscription pour %s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
--- 1578,1582 ----
  #, c-format
  msgid "Subscription information for %s"
! msgstr "Information d'abonnement pour%s"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:42
***************
*** 1599,1603 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
--- 1600,1604 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:23
  msgid "Suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:44
***************
*** 1702,1706 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Suggestions d'achat"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
--- 1703,1707 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl:58
  msgid "View & manage suggestions"
! msgstr "Voir et g?rer les suggestions"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-user.tmpl:17 
***************
*** 1777,1781 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou un mot de document invalide, merci de r?essayer"
  
  #. %1$s: TMPL_VAR name=issues_count 
--- 1778,1782 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:20
  msgid "You entered an incorrect username or password, please try again."
! msgstr "Vous avez saisi un nom de membre ou mot de passe invalide, merci de r?essayer."
  
  #. %1$s: TMPL_VAR name=issues_count 
***************
*** 1827,1831 ****
  #
  msgid "Your biblio basket"
! msgstr "Panier de Biblioth?que"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1828,1832 ----
  #
  msgid "Your biblio basket"
! msgstr "Votre panier de notices"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1845,1849 ****
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code barre"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11
--- 1846,1850 ----
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:105
  msgid "barcode"
! msgstr "code ? barres"
  
  #: /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:11

Index: default_intranet_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_fr_FR.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** default_intranet_fr_FR.po	8 Dec 2004 10:36:04 -0000	1.4
--- default_intranet_fr_FR.po	5 Jan 2005 14:41:50 -0000	1.5
***************
*** 1,10449 ****
  # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
  # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
! "PO-Revision-Date: 2004-11-24 15:06+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
[...22711 lines suppressed...]
  
! #. SCRIPT
! #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/stopwords.tmpl:54
  msgid "word missing"
  msgstr "mot manquant"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
  msgstr "ann?e"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
  msgid "z3950 search"
  msgstr "Recherche Z39.50"
  
! #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
! msgid ""
! "|{700a}{701a}{702a}| ; #200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. "
! "200i}{ / 200f}{ ; 200g}|"
  msgstr ""
  




From tipaul at users.sourceforge.net  Wed Jan  5 15:42:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 05 Jan 2005 06:42:13 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator rebuild_lang.sh,1.1,1.2
Message-ID: <E1CmCMX-0007o6-Pj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29975/misc/translator

Modified Files:
	rebuild_lang.sh 
Log Message:


Index: rebuild_lang.sh
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/rebuild_lang.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** rebuild_lang.sh	3 Jan 2005 16:30:13 -0000	1.1
--- rebuild_lang.sh	5 Jan 2005 14:42:03 -0000	1.2
***************
*** 3,9 ****
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/zh_TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh_TW
  
! ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es_AR
--- 3,9 ----
  ./tmpl_process3.pl install -r -s po/default_intranet_fr_FR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/fr
  
! ./tmpl_process3.pl install -r -s po/css_opac_zh_TW.po -i ../../koha-tmpl/opac-tmpl/css/en -o ../../koha-tmpl/opac-tmpl/css/zh-TW
! ./tmpl_process3.pl install -r -s po/default_intranet_zh_TW.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/zh-TW
  
! # ./tmpl_process3.pl install -r -s po/css_opac_es_AR.po -i ../../koha-tmpl/opac-tmpl/css/zh_TW -o ../../koha-tmpl/opac-tmpl/css/es_AR
! ./tmpl_process3.pl install -r -s po/default_intranet_es_AR.po -i ../../koha-tmpl/intranet-tmpl/default/en -o ../../koha-tmpl/intranet-tmpl/default/es




From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig - New directory
Message-ID: <E1CmDLr-0002Zv-KQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/labelConfig

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes - New directory
Message-ID: <E1CmDLr-0002Zs-JV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9891/countryCodes

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes added to the repository





From oleonard at users.sourceforge.net  Wed Jan  5 16:45:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:45:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-barcodes-close.inc,NONE,1.1
Message-ID: <E1CmDLW-0002YW-Ia@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9811/koha-tmpl/intranet-tmpl/npl/en/includes

Added Files:
	doc-head-barcodes-close.inc 
Log Message:
Required for barcode generator

--- NEW FILE ---
</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
<style type="text/css"> 
	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
</style>
<style>
.parameters {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
a.parameters:hover {
	background-color: #86c268;
	color: #FFFFFF;
	text-decoration: normal;
	font-weight: bold;
	}
.ranges {
	border:0;
}

.myTable TD{
  border-width: 0px;
  border-color: navy;
  border-style: solid;
}

.panel { 
	position:relative;
}

.countryPanel {
	z-index:1;
	width:300px;
	display:none;
	border:1px solid #000000;
	padding:0px;
}
</style>


<script type="text/javascript">
	// Captura el evento onmousemove para cualquier navegador
	if (document.layers) { // Netscape
		document.captureEvents(Event.MOUSEMOVE);
	    document.onmousemove = captureMousePosition;
	} else if (document.all) { // Internet Explorer
	    document.onmousemove = captureMousePosition;
	} else if (document.getElementById) { // Netcsape 6
	    document.onmousemove = captureMousePosition;
	}

	var mouseXMax = 0;
	var mouseYMax = 0;
	var mouseX = 0;
	var mouseY = 0;

	function captureMousePosition(e) {
	    if (document.layers) {
		    mouseX = e.pageX;
			mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
		    mouseYMax = window.innerHeight + window.pageYOffset;
	    } else if (document.all) {
		    mouseX = window.event.x + document.body.scrollLeft;
	        mouseY = window.event.y + document.body.scrollTop;
	        mouseXMax = document.body.clientWidth + document.body.scrollLeft;
	        mouseYMax = document.body.clientHeight + document.body.scrollTop;
	    } else if (document.getElementById) {
	        mouseX = e.pageX;
		    mouseY = e.pageY;
	        mouseXMax = window.innerWidth + window.pageXOffset;
	        mouseYMax = window.innerHeight + window.pageYOffset;
	    }
	}

/* Devuelve true si el explorador es Internet Explorer */
var IE = document.all?true:false;

function Help() {
	newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
}

function correctRange (from, to) {
	if (from <= to) {
		return true;
	} else {
		return false;
	}
}

function emptyField (field) {
	if ((field == null) || (field == "")) {
		return true;
	} else {
		return false;
	}
}

function checkFields (aForm) {
  var option = document.getElementById('rangeType').value;
  if (option == 'continuous' || option == 'continuous2') {
	if (emptyField(aForm.from.value) || emptyField(aForm.to.value)) {
		alert("Please, complete all fields");
	    return false;
	} else {
		if (correctRange(aForm.from.value, aForm.to.value)) {
			return true;			
		} else {
			alert("The selected range is not correct");
			return false;
		}
	}
  } else {
	var codeCount = document.getElementById('inventaryList').options.length;
	if (codeCount == 0) {
		alert("Please, complete all fields"); 
	    return false;
	} else {
		var inventaryList = document.getElementById('inventaryList');
		var allCodes = '';
	  	for (i = 0; i <= inventaryList.options.length - 1; i++) {
			allCodes = allCodes + "'" + inventaryList.options[i].text + "',";
	  	}
  		allCodes = '(' + allCodes.substr(0, allCodes.length - 1) + ')';
	  	document.getElementById('individualCodes').value = allCodes;
	    return true;
	}
  }
}

function changeRange(selectBox) {
	var option = selectBox.value;
	var panel = document.getElementById(option);
	panel.style.display = 'inline';
	if (option == 'continuous') {
		document.getElementById('inventaryList').options.length = 0;
		document.getElementById('individuals').style.display = 'none';
		document.getElementById('individualCodes').value = "";
	} else {
		document.getElementById('from').value = "";
		document.getElementById('to').value = "";
		document.getElementById('continuous').style.display = 'none';
	}
}

function itemExists(code, list) {
  var ok = false;
  var listLength = list.length - 1;
  var count = 0;
  while (!(ok) && (count <= listLength)) {
	if (code == list[count].value) {
	  ok = true;
	}
	count = count + 1;
  }
  return ok;	
}

function addItem() {
  var codeObject = document.getElementById('inventaryCode');
  var inventaryCode = document.getElementById('inventaryCode').value;
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryCode == "") {
    alert('You can?t add an empty code.');
  } else {
    if (itemExists(inventaryCode, inventaryList.options)) {
	  codeObject.value = "";
  	  alert("The code is already included."); 
    } else {  	
	  var optionObject = new Option(inventaryCode, inventaryCode);
  	   if (!IE) {
	     inventaryList.add(optionObject, inventaryList.options[inventaryList.options.length]); 
      } else {
	    inventaryList.add(optionObject, inventaryList.options.length);
	  }
      codeObject.value = "";
    }
  }	
}

function removeItem() {
  var inventaryList = document.getElementById('inventaryList');
  if (inventaryList.selectedIndex == -1) {
  	alert('You have to select a code first.');
  } else {
  	inventaryList.options[inventaryList.selectedIndex] = null;
  }
}

	function addCountryCode() {
		var panel = document.getElementById('addCountryCode');
		panel.style.display = 'inline';
		panel.style.top = mouseY;
		panel.style.left = mouseX;
	}
</script>
</head>
<body onload="javascript: changeRange(document.getElementById('rangeType'))">



From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes countryCodes.dat,NONE,1.1
Message-ID: <E1CmDMl-0002fl-ET@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/countryCodes

Added Files:
	countryCodes.dat 
Log Message:
Required for barcode generator

--- NEW FILE ---
00 = USA I

93 = Australia

94 = New Zealand

779 = Argentina

773 = Uruguay

30 = France I

84 = Spain

45 = Japan

777 = Bolivia

80 = Italy I

73 = Sweden

40 = Germany

31 = France II

254 = Ucrania





From oleonard at users.sourceforge.net  Wed Jan  5 16:46:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 05 Jan 2005 07:46:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig itemsLabelConfig.conf,NONE,1.1
Message-ID: <E1CmDMl-0002fp-M1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10266/koha-tmpl/intranet-tmpl/npl/en/includes/labelConfig

Added Files:
	itemsLabelConfig.conf 
Log Message:
Required for barcode generator

--- NEW FILE ---
marginBottom = 25
pageType = A4
columns = 5
systemDpi = 96
labelHeigth = 21
rows = 13
marginLeft = 2
labelWidth = 41




From tipaul at users.sourceforge.net  Thu Jan  6 15:32:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 06:32:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.114,1.115
Message-ID: <E1CmYgW-00045G-3h@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15653/C4

Modified Files:
	Biblio.pm 
Log Message:
improvement of speed for bulkmarcimport.
A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.114
retrieving revision 1.115
diff -C2 -r1.114 -r1.115
*** Biblio.pm	3 Jan 2005 10:48:33 -0000	1.114
--- Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
***************
*** 1135,1140 ****
      my $tagfield;
      my $subfield;
!     $sth->execute($frameworkcode, $kohatable . "." . $kohafield );
!     ( $tagfield, $subfield ) = $sth->fetchrow;
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
--- 1135,1139 ----
      my $tagfield;
      my $subfield;
!     ( $tagfield, $subfield ) = MARCfind_marc_from_kohafield("",$kohatable.".".$kohafield,$frameworkcode);
      foreach my $field ( $record->field($tagfield) ) {
          if ( $field->subfield($subfield) ) {
***************
*** 2635,2638 ****
--- 2634,2642 ----
  # $Id$
  # $Log$
+ # Revision 1.115  2005/01/06 14:32:17  tipaul
+ # improvement of speed for bulkmarcimport.
+ # A sub had been forgotten to use the C4::Context->marcfromkohafield array, that caches DB datas.
+ # this is only a little improvement for normal DB modif, but almost x2 the speed of bulkmarcimport... from 6records/seconds to more than 10.
+ #
  # Revision 1.114  2005/01/03 10:48:33  tipaul
  # * bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)




From tipaul at users.sourceforge.net  Thu Jan  6 16:25:38 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 06 Jan 2005 07:25:38 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CmZW6-000743-RB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27117/fr

Added Files:
	migrer_ses_donnees.xml 
Log Message:
document explaining how to migrate data & set up a highly tuned Koha catalogue (in French, sorry for frenchphobes or french-ignorants)

--- NEW FILE ---
<?xml version="1.0" encoding="ISO-8859-15"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<book>
  <title>Param?trer et migrer ses donn?es vers Koha 2.2</title>

  <chapter>
    <title>Introduction</title>

    <articleinfo><pubdate>2002-01-06</pubdate> <author>
    <firstname>Paul</firstname> <surname>POULAIN</surname> <authorblurb>
    Consultant ind?pendant en logiciels libres, Koha "Release Manager" pour la
    version 2.0 puis 2.2, membre du comit? de pilotage
    international<para></para></authorblurb><email>paul AT koha-fr.org</email>
    </author> <revhistory> <revision><revnumber>2.2.0</revnumber>
    <date>2005-01-06</date> <authorinitials>pp</authorinitials>
    <revdescription> Version initiale<para></para> </revdescription>
    </revision> </revhistory></articleinfo>

[...1138 lines suppressed...]
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);

</programlisting>

        <para>Notez que le code qui pr?c?de ne traite pas des notices
        d'exemplaire (l?, c'est vraiment trop sp?cifique)</para>
      </section>
    </section>
  </chapter>
</book>



From shedges at users.sourceforge.net  Mon Jan 10 12:59:20 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Mon, 10 Jan 2005 03:59:20 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/installation Installing_Koha_on_Fedora.xml,1.1,1.2
Message-ID: <E1CnyCe-0000CJ-0N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/installation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv749

Modified Files:
	Installing_Koha_on_Fedora.xml 
Log Message:
Add info on Apache and selinux

Index: Installing_Koha_on_Fedora.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/installation/Installing_Koha_on_Fedora.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Installing_Koha_on_Fedora.xml	2 Jan 2005 14:12:40 -0000	1.1
--- Installing_Koha_on_Fedora.xml	10 Jan 2005 11:59:17 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2005-01-03</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-09</pubdate>
  
      <author>
***************
*** 24,27 ****
--- 24,39 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-08</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Add information on SELinux to Apache section</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 457,461 ****
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust selinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
--- 469,473 ----
  
        <para>Note that If <application>MySQL</application> fails to start you
!       may need to adjust SELinux. To do that type the
        following:<literallayout>[root at koha ~]# setenforce 0
  [root at koha ~]# mysql_install_db
***************
*** 522,525 ****
--- 534,561 ----
        <application>Apache</application>'s log files are in
        <filename>/var/log/httpd</filename>.</para>
+ 
+       <para>As with <application>MySQL</application>, there is an issue with
+       SELinux on <application>Fedora Core</application> 3 and the
+       <application>Apache</application> web server that prevents execution of
+       the CGI scripts. Instead of disabling SELinux for httpd, just change the
+       context for the <application>Koha</application> directories. The utility
+       for doing this is called '<command>chcon</command>.' Here's a brief
+       description of how to use it:</para>
+ 
+       <para>First, check the context for the directories that you know work
+       for httpd:<literallayout>[root at koha]# ls -Z /var/www/
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_script_exec_t cgi-bin
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t error
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t html
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t icons
+ drwxr-xr-x  root     root     system_u:object_r:httpd_sys_content_t manual
+ drwxr-xr-x  webalize root     system_u:object_r:httpd_sys_content_t usage</literallayout></para>
+ 
+       <para>Then, use the <command>chcon</command> utility to label the Koha
+       subdirectories as for their counterparts in
+       <filename>/var/www</filename>. Here's the syntax:<literallayout><userinput>chcon &lt;context&gt; /usr/local/koha/&lt;subdirectory&gt;</userinput></literallayout></para>
+ 
+       <para>For more info on SELinux check out the Fedora Core 3 FAQ: <ulink
+       url="http://fedora.redhat.com/docs/selinux-faq-fc3/">http://fedora.redhat.com/docs/selinux-faq-fc3/</ulink></para>
      </section>
  




From oleonard at users.sourceforge.net  Mon Jan 10 17:46:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:46:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.4.2.1
Message-ID: <E1Co2gz-0007Uw-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28801/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 17:49:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 08:49:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4,1.5
Message-ID: <E1Co2jH-0007eH-Mz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29393/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member.tmpl 
Log Message:
Removing accidentally-hardcoded member number

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** member.tmpl	27 Oct 2004 15:35:03 -0000	1.4
--- member.tmpl	10 Jan 2005 16:49:17 -0000	1.5
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=20375&modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:00:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:00:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marc_subfields_structure.tmpl,1.2,1.3
Message-ID: <E1Co2u9-0008Lm-GF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32072/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Synching with default tempalte

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marc_subfields_structure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marc_subfields_structure.tmpl	10 Jan 2005 17:00:30 -0000	1.3
***************
*** 4,120 ****
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
! <!-- TMPL_IF name="add_form" -->
! <!-- -->
! 
! 	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<h1><!-- TMPL_VAR name="action" --></h1>
! 	<div class="table"><table>
! 	<tr><th>Field</th>
! 		<th>Lib for librarians / for opac</th>
! 		<th>Repeat</th>
! 		<th>Mand</th>
! 		<th>Koha field</th>
! 		<th>Tab</th>
! 		<th>Authorised value or<br/>
! 				Thesaurus category</th>
! 	</tr>
! 	<!-- TMPL_LOOP name="loop" -->
! 		<tr>
! 		<td><!-- TMPL_VAR name="tagfield" --> - <!-- TMPL_VAR name="tagsubfield" --></td>
! <td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="40" maxlength="80" /><br />
! 				<input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="40" maxlength="80" /></td>
! 		
! 		<td><!-- TMPL_VAR name="repeatable" --></td>
! 		<td><!-- TMPL_VAR name="mandatory" --></td>
! 		<td><!-- TMPL_VAR name="kohafield" --></td>
! 		<td><!-- TMPL_VAR name="tab" --></td>
! 		<td><!-- TMPL_VAR name="authorised_value" --><br/>
! 				or <!-- TMPL_VAR name="thesaurus_category" --><br/>
! 				or <!-- TMPL_VAR name="value_builder" --></td></tr>
  	<!-- /TMPL_LOOP -->
! 	</table>	<input type="submit" class="submit" value="OK" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" />
! 	<p>Note : in the last column, you can choose :</p>
! 	<ul><li>An "authorised value" : it refers to a list of authorised value for this subfield. See the corresponding admin table</li>
! 	<li>A "thesaurus category" : it refers to a thesaurus category. See the corresponding admin table</li>
! 	<li>A "value builder" : values builders are perl program that helps you select the value of the field. They are MARC-flavor dependant and sometimes fills an other subfield automaticaly</li>
  	</ul>
! 	</div>
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirm" -->
! <!-- -->
! <div class="table details"><table>
! <caption>Confirm Deletion of Subfield <em><!-- TMPL_VAR name="tagsubfield" --></em></caption>
  	<tr>
! 		<th>Subfield</th>
! 		<td><!-- TMPL_VAR name="tagsubfield" --></td>
  	</tr>
- 	<tr><th>&nbsp;</th><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
- </table></div>
- 	<div class="tabitem">	<form action="<!-- TMPL_VAR name="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" />
- 	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
- 	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" /><input type="submit" class="cancel"  value="Delete this Subfield" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="submit" class="submit" value="Do not Delete" /></form></div>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF name="delete_confirmed" -->
! <!-- -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR name="script_name" --> method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" />
! 	<input type="submit" class="submit"  value="OK" />
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- -->
! <!-- TMPL_IF name="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on "edit". </p>
! <p>The column <b>koha field</b> shows that the subfield is linked with a "koha field". Koha can manage a marc interface, or a koha interface. This link
! ensure that both DB are synchronized, thus you can change from MARC to KOHA interface easily.</p>
! <div class="table">
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Lib</th>
! 	<th>Koha Field <span class="help" title="the koha-DB field linked to this subfield">?</span></th>
! 	<th>Rep <span class="help" title="subfield may be repeated (1=yes, 0=no)">?</span></th>
! 	<th>Mand <span class="help" title="subfield is mandatory (1=yes, 0=no)">?</span></th>
! 	<th>Tab <span class="help" title="subfield is shown in which tab (0-9 or item)">?</span></th>
! 	<th>Auth value <span class="help" title="values authorised for this subfield">?</span></th>
! 	<th>Thesaurus <span class="help" title="Thesaurus linked to this subfield">?</span></th>
! 	<th>Val build <span class="help" title="Value builder">?</span></th>
  	<th>Delete</th>
! </tr>
! <!-- TMPL_LOOP name="loop" -->
! <tr>
! 	<td><!-- TMPL_IF name="tagsubfield" --><!-- TMPL_VAR name="tagsubfield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="liblibrarian" --><!-- TMPL_VAR name="liblibrarian" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="kohafield" --><!-- TMPL_VAR name="kohafield" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="repeatable" --><!-- TMPL_IF name="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="mandatory" --><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="tab" --><!-- TMPL_VAR name="tab" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="authorised_value" --><!-- TMPL_VAR name="authorised_value" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="thesaurus_category" --><!-- TMPL_VAR name="thesaurus_category" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><!-- TMPL_IF name="value_builder" --><!-- TMPL_VAR name="value_builder" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
! 	<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table>
  
! <div class="tabitem"><!-- TMPL_IF name="previous" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" /></a><!-- /TMPL_IF --> 
! 
! <form action="/cgi-bin/koha/admin/marc_subfields_structure.pl" method="get"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->" /><input type="hidden" name="op" value="add_form" /><input type="submit" value="Edit Subfields" class="submit" /></form>
! 
! <form action="marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="tagfield" -->" name="searchfield" /><input type="submit" class="submit" value="&lt;&lt; Back to Tag" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" --><input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" /></a><!-- /TMPL_IF --></div>
! </div>
  <!-- /TMPL_IF -->
- 
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 4,171 ----
  <!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF name="else" -->MARC Subfield Structure for '<!-- TMPL_VAR name="tagfield" -->'<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
! <!-- TMPL_IF NAME="add_form" -->
! <!-- ------------------------------------------------------------------------ -->
! 	<h1><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
! 	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
! 	
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<table>
! 		<caption><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2></caption>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>MARC constraints</h3></th></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="repeatable">Repeatable: </label></td><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="mandatory">Mandatory: </label></td><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="seealso">Search also: </label></td><td><input type="text" id="seealso" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" />(example for 200a : '200c','200d','200e'...)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Koha link:</label></td><td><!-- TMPL_VAR NAME="kohafield" --></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<th colspan="2"><h3>Editor constaints</h3></th>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Text for librarian</label></td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="libopac">Text for OPAC</label></td><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>Managed in tab</label></td><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td>
! 		</tr>
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label>hidden&nbsp;</label></td><td><!-- TMPL_VAR NAME="hidden" -->(subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label> URL&nbsp;</label></td><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td>
! 		</tr>					
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authorised_value">Auth value:</label></td><td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		</tr>									 
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="authtypes">...or Thesaurus:</label></td><td><!-- TMPL_VAR NAME="authtypes" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="value_builder">...or Plugin:</label></td><td><!-- TMPL_VAR NAME="value_builder" --></td>
! 		</tr>	
! 		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><label for="link">...or Link:</label></td><td><input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)</td>
! 		</tr></table><br />
  	<!-- /TMPL_LOOP -->
! 	
! 	<input type="submit" class="submit" value="Save Changes">
! 	<p>Note: in the last column, you can choose:</p>
! 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
! 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
! 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
  	</ul>
! 	
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirm" -->
! <!-- ------------------------------------------------------------------------ -->
! <table border="0" cellspacing="0" cellpadding="2">
! 	<tr valign="top" bgcolor="#99cc33">
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Subfield</b></td>
! 		<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b><!-- TMPL_VAR NAME="tagsubfield" --></b></td>
! 	</tr>
! 	<tr><td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
! 	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
  	<tr>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="YES">
! 			</form>
! 		</td>
! 		<td>
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 				<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->">
! 				<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 				<input type="submit" value="NO">
! 			</form>
! 		</td>
  	</tr>
  <!-- /TMPL_IF -->
  
! <!-- TMPL_IF NAME="delete_confirmed" -->
! <!-- ------------------------------------------------------------------------ -->
  	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
! 	<input type="submit" value="OK">
  	</form>
  <!-- /TMPL_IF -->
  
! <!-- ------------------------------------------------------------------------ -->
! <!-- TMPL_IF NAME="else" -->
! <h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="frameworkcode" -->(framework <!--TMPL_VAR NAME="frameworkcode" -->)<!-- /TMPL_IF --></h1>
! <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
! <p>The column <b>Koha field</b> shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
! 
  <table>
  <tr>
  	<th>Subfield</th>
! 	<th>Text</th>
! 	<th>Constraints</th>
  	<th>Delete</th>
! <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
! 		<!-- TMPL_ELSE -->
! 			<!-- TMPL_VAR NAME="liblibrarian" -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td>
! 		<!-- TMPL_IF NAME="subfield_ignored" -->
! 			<i>subfield ignored</i>
! 		<!-- TMPL_ELSE -->
! 			Tab :<!-- TMPL_VAR NAME="tab" -->,
! 			<!-- TMPL_IF NAME="kohafield" -->Koha field : <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
! 			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="authtypecode" --> Authority :<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="link" -->Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
! 		<!-- /TMPL_IF -->
! 	</td>
! 	<td><a class="delete" href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
! </table><form class="inline" action="<!-- TMPL_VAR NAME="SCRIPT_NAME" -->" method="get"><input type="hidden" value="add_form" name="op" /><input type="hidden" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" name="tagfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="framworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Edit these Parameters" /></form>
! <form class="inline" action="/cgi-bin/koha/admin/marctagstructure.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR NAME="tagfield" -->" name="searchfield" /><input type="hidden" value="<!-- TMPL_VAR NAME="frameworkcode" -->" name="frameworkcode" /><input type="submit" class="submit" value="Back to MARC Tag Structure" /></form>
  
! <!-- TMPL_IF NAME="previous" -->
! 	<input type="submit" class="submit" value="&lt;&lt; Previous" />
! 	</a><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="next" -->
! 	<!-- TMPL_VAR NAME="next" -->
! 		<input type="submit" class="submit" value="Next &gt;&gt;" />
! 	</a>
! <!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 18:02:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:02:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1 bull-home.tmpl,1.1,1.2 order.tmpl,1.1,1.2 result.tmpl,1.1,1.2 search-supply.tmpl,1.1,1.2 search.tmpl,1.1,1.2 statecollection.tmpl,1.2,1.3 subscription-add.tmpl,1.2,1.3
Message-ID: <E1Co2wU-0008WJ-9H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32715/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:02:54 -0000	1.3
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:05:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:05:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull lateissues.tmpl,NONE,1.1.2.1 bull-home.tmpl,1.1,1.1.2.1 order.tmpl,1.1,1.1.2.1 result.tmpl,1.1,1.1.2.1 search-supply.tmpl,1.1,1.1.2.1 search.tmpl,1.1,1.1.2.1 statecollection.tmpl,1.2,1.2.2.1 subscription-add.tmpl,1.2,1.2.2.1
Message-ID: <E1Co2yY-0000Ea-Uu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv830/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl order.tmpl result.tmpl search-supply.tmpl 
	search.tmpl statecollection.tmpl subscription-add.tmpl 
Added Files:
      Tag: rel_2_2
	lateissues.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<h1>Late issues</h1>
<form action="lateissues.pl" method="post">
<label for="supplier">Supplier: </label>
<!-- TMPL_VAR name="CGIsupplier" -->
<input type="submit" value="Filter" class="submit">
</form>
<!-- TMPL_IF NAME="lateissues" -->
	<table>
		<tr>
			<th>Supplier</th>
			<th>Title</th>
			<th>Issue number</th>
			<th>Late since</th>
			<th colspan="2">&nbsp;</th>
		</tr>
<!-- TMPL_LOOP name="lateissues" -->
			<tr>
				<td><!-- TMPL_VAR name="name" --></td>
				<td><!-- TMPL_VAR name="Title" --></td>
				<td><!-- TMPL_VAR name="serialseq" --></td>
				<td><!-- TMPL_VAR name="planneddate" --></td>
				<td><a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Details</a></td><td><a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
			</tr>
	<!-- /TMPL_LOOP -->
	</table>
<!-- /TMPL_IF -->
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bull-home.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 13,17 ****
  			<th colspan="2">&nbsp;</th>
  		</tr>
- 		<!-- TMPL_IF NAME="subscriptions" -->
  		<tr>
  			<td>
--- 13,16 ----
***************
*** 21,28 ****
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="3">
! 				<input type="submit" value="Filter" class="submit">
  			</td>
! 		</tr><!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
--- 20,27 ----
  				<input type="text" size="11" maxlength="11" name="ISSN" value="<!-- TMPL_VAR name="ISSN" -->">
  			</td>
! 			<td colspan="2">
! 				<input type="submit" value="Search" class="submit">
  			</td>
! 		</tr>
  		<!-- TMPL_IF NAME="subscriptions" -->
  		<!-- TMPL_LOOP name="subscriptions" -->
***************
*** 35,48 ****
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a>
! 					<a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Recieve</a>
! 				</td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">There are no subscriptions.</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<a href="/cgi-bin/koha/bull/subscription-add.pl">Add subscription</a>
  </div>
  
--- 34,45 ----
  				</td>
  				<td>
! 					<a href="bull/subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Detail</a></td><td><a href="bull/statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->">Receive</a></td>
  			</tr>
  		<!-- /TMPL_LOOP -->
  		<!-- TMPL_ELSE -->
! 		<tr><td colspan="3">Enter search terms above to display subscriptions</td></tr>
  		<!-- /TMPL_IF -->
  	</table></form>
! 	<p><form action="/cgi-bin/koha/bull/subscription-add.pl" method="get"><input type="submit" class="submit" value="Add Subscription" /></form></p>
  </div>
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/order.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** order.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- order.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Supplier Search Results</h1>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** result.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 7,12 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --> <span class="current"> <!-- TMPL_VAR NAME="number" --> </span><!-- TMPL_ELSE -->
! 					 <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
--- 7,12 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME="numbers" -->
! 				<!-- TMPL_IF NAME=highlight --><span class="current"><!-- TMPL_VAR NAME="number" --></span><!-- TMPL_ELSE -->
! 					  <a class="pages" href="subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a> 
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
***************
*** 40,46 ****
  					</p>
  				</td>
! 				<td><!-- TMPL_UNLESS NAME="norequests" -->
! 				<form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS -->
! 				</td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: search-supply.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search-supply.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search-supply.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search-supply.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 1,4 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
! 
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Search supplier for serial subscription<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <h1>Search supplier for serial subscription</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
***************
*** 13,17 ****
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value" onchange="sql_update()"></td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
--- 13,17 ----
  			<input type="hidden" name="excluding" value="">
  			<input type="hidden" name="operator" value="contains">
! 			<input type="text" id="keyword" name="value"> (<a href="<!-- TMPL_VAR NAME="SCRIP_NAME" -->" onclick="PopupSuggestion(); return false;">Suggestions</a>)</td></tr>
  		<tr><th><label for="resultsperpage">Results per page:</label></th><td><select align="right" name="resultsperpage" id="resultsperpage" size="1">
  				<option value="20">20</option>
***************
*** 27,32 ****
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit">
! 			<a href="javascript:PopupSuggestion()" class="button catalogue">Suggestions</a></p>
  	</div>
  	<div>
--- 27,31 ----
  			</select></td></tr>
  		</table>		
! 		<p><input type="submit" value="Start search" class="submit"></p>
  	</div>
  	<div>

Index: statecollection.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** statecollection.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- statecollection.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 19,26 ****
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Arrived Numbers:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Gapped Numbers:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr>
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>
--- 19,26 ----
  		<tr><th><label for="histstartdate">Beginnning date<sup>*</sup>:</label></th><td><input type="text" name="histstartdate" id="histstartdate" value="<!-- TMPL_VAR name="histstartdate" -->" /></td></tr>
  		<tr><th><label for="enddate">End date:</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR name="enddate" -->" /></td></tr>
! 		<tr><th><label for="recievedlist">Received Issues:</label></th><td><textarea id="recievedlist" name="recievedlist" cols="40" rows="2"><!-- TMPL_VAR name="recievedlist" --></textarea></td></tr>
! 		<tr><th><label for="missinglist">Missing Issues:</label></th><td><textarea id="missinglist" name="missinglist" cols="40" rows="2"><!-- TMPL_VAR name="missinglist" --></textarea></td></tr>
  		<tr><th><label for="opacnote">OPAC Note:</label></th><td><textarea id="opacnote" name="opacnote" cols="40" rows="2"><!-- TMPL_VAR name="opacnote" --></textarea></td></tr>
! <!-- 		<tr><th><label for="librariannote">Intranet Note:</label></th><td><textarea name="librariannote" cols="40" id="librariannote" rows="2"><!-- TMPL_VAR name="librariannote" --></textarea></td></tr> -->
  </table>
  		<p><input type="submit" value="Save changes" class="submit" /></p>

Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-add.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-add.tmpl	10 Jan 2005 17:05:03 -0000	1.2.2.1
***************
*** 1,6 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
  <div id="main">
--- 1,6 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF name="mod" -->Modify a Subscription<!-- TMPL_ELSE -->Add a New Subscription<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
  <div id="main">
***************
*** 8,25 ****
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription">
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->">
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription">
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->">
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
--- 8,25 ----
  	<h1>Modify subscription</h1>
  	<form method="post" name="f" action="subscription-detail.pl">
! 		<input type="hidden" name="op" value="modsubscription" />
! 		<input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" />
  <!-- TMPL_ELSE -->
  	<h1>Add a subscription</h1>
! 	<form method="post" name="f" action="subscription-detail.pl">
  <!-- /TMPL_IF -->
  <div class="data">
  	<table>
  	<caption>Subscription information for <i><!-- TMPL_VAR name="bibliotitle" --></i></caption>
! 		<tr><th><input type="hidden" name="op" value="addsubscription" />
! 		<input type="hidden" name="user" value="<!-- TMPL_VAR name="user" -->" />
  		Librarian: </th><td><!-- TMPL_VAR name="user" --></td></tr>
! 		<tr><th><label for="aqbooksellerid">Supplier: </label></th><td><input type="text" id="aqbooksellerid" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="4" /> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="FindAcqui(f); return false;" /></td></tr>
! 		<tr><th><label for="biblionumber">Bibliographic Record: </label></th><td><input type="text" id="biblionumber" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="4" /> (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />) <input type="button" class="submit" value="Search..." onclick="Plugin(f); return false;" /></td></tr>
  		<tr><th><label for="notes-field">Notes</label></th><td><textarea id="notes-field" name="notes" cols="30" rows="2"><!-- TMPL_VAR name="notes" --></textarea></td></tr>
  </table>
***************
*** 33,92 ****
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10"></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected>Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected>1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected>1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected>1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected>1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected>1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected>1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected>1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected>1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected>1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected>1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected>1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
--- 33,92 ----
  	<table>
  	<caption>Planning</caption>
! 	<tr><th><label for="startdate">Beginnning date:</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" size="13" maxlength="10" /></td></tr>
  	<tr><th><label for="periodicity">Frequency (*)</label></th><td>
  			<select name="periodicity" size="1" id="periodicity">
! 				<option value="" selected="selected">Unknown</option>
  				<!-- TMPL_IF name="periodicity1" -->
! 					<option value="1" selected="selected">1/day</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">1/day</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity2" -->
! 					<option value="2" selected="selected">1/week</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">1/week</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity3" -->
! 					<option value="3" selected="selected">1/2 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">1/2 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity4" -->
! 					<option value="4" selected="selected">1/3 weeks</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">1/3 weeks</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity5" -->
! 					<option value="5" selected="selected">1/month</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">1/month</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity6" -->
! 					<option value="6" selected="selected">1/2 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">1/2 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity7" -->
! 					<option value="7" selected="selected">1/3 months</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">1/3 months</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity8" -->
! 					<option value="8" selected="selected">1/quarter</option>
  				<!-- TMPL_ELSE -->
  					<option value="8">1/quarter</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity9" -->
! 					<option value="9" selected="selected">1/2 quarters</option>
  				<!-- TMPL_ELSE -->
  					<option value="9">1/2 quarters</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity10" -->
! 					<option value="10" selected="selected">1/year</option>
  				<!-- TMPL_ELSE -->
  					<option value="10">1/year</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="periodicity11" -->
! 					<option value="11" selected="selected">1/2 years</option>
  				<!-- TMPL_ELSE -->
  					<option value="11">1/2 years</option>
***************
*** 98,132 ****
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected>Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected>Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected>Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected>Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected>Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected>Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected>Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
--- 98,132 ----
  				<option value="">None</option>
  				<!-- TMPL_IF name="dow1" -->
! 					<option value="1" selected="selected">Monday</option>
  				<!-- TMPL_ELSE -->
  					<option value="1">Monday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow2" -->
! 					<option value="2" selected="selected">Tuesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="2">Tuesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow3" -->
! 					<option value="3" selected="selected">Wednesday</option>
  				<!-- TMPL_ELSE -->
  					<option value="3">Wednesday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow4" -->
! 					<option value="4" selected="selected">Thursday</option>
  				<!-- TMPL_ELSE -->
  					<option value="4">Thursday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow5" -->
! 					<option value="5" selected="selected">Friday</option>
  				<!-- TMPL_ELSE -->
  					<option value="5">Friday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow6" -->
! 					<option value="6" selected="selected">Saturday</option>
  				<!-- TMPL_ELSE -->
  					<option value="6">Saturday</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dow7" -->
! 					<option value="7" selected="selected">Sunday</option>
  				<!-- TMPL_ELSE -->
  					<option value="7">Sunday</option>
***************
*** 138,149 ****
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->"></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->"></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->"></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
- 	<p>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
--- 138,148 ----
  	<table>
  	<caption>Subscription Length (choose one)</caption>
! 	<tr><th><label for="numberlength">Number of issues: </label></th><td><input type="text" id="numberlength" name="numberlength" value="<!-- TMPL_VAR name="numberlength" -->" /></td></tr>
! 	<tr><th><label for="weeklength">Number of weeks</label></th><td><input type="text" id="weeklength" name="weeklength" value="<!-- TMPL_VAR name="weeklength" -->" /></td></tr>
! 	<tr><th><label for="monthlength">Number of months</label></th><td><input type="text" id="monthlength" name="monthlength" value="<!-- TMPL_VAR name="monthlength" -->" /></td></tr>
  </table>
  </div>
  <div class="data">
  	<h2>Numbering calculation</h2>
  		<p><label for="numberingmethod">Numbering formula:</label> <input type="text" id="numberingmethod" name="numberingmethod" size="45" value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
  		<table>
***************
*** 167,193 ****
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->"></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->"></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->"></td>
  			</tr>
  			<tr>
--- 166,192 ----
  			<tr>
  				<th scope="row"><label for="every1">...Once every:</label></th>
! 				<td><input type="text" id="every1" name="every1" value="<!-- TMPL_VAR name="every1" -->" /></td>
! 				<td><input type="text" id="every2" name="every2" value="<!-- TMPL_VAR name="every2" -->" /></td>
! 				<td><input type="text" id="every3" name="every3" value="<!-- TMPL_VAR name="every3" -->" /></td>
  			</tr>
  			<tr>
  				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
! 				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
! 				<td><input type="text" id="whenmorethan2" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
! 				<td><input type="text" id="whenmorethan3" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
  			</tr>
  			<!-- TMPL_IF name="mod" -->
  			<tr>
  				<th scope="row"><label for="innerloop1">The loop is for instance: </label></th>
! 				<td><input type="text" id="innerloop1" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
! 				<td><input type="text" id="innerloop2" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
! 				<td><input type="text" id="innerloop3" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
  			</tr>
  			<!-- /TMPL_IF -->
  			<tr>
  				<th scope="row"><label for="setto1">...Set back to:</label></th>
! 				<td><input type="text" id="setto1"  name="setto1" value="<!-- TMPL_VAR name="setto1" -->" /></td>
! 				<td><input type="text" id="setto2" name="setto2" value="<!-- TMPL_VAR name="setto2" -->" /></td>
! 				<td><input type="text" id="setto3" name="setto3" value="<!-- TMPL_VAR name="setto3" -->" /></td>
  			</tr>
  			<tr>
***************
*** 199,217 ****
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit">
  <!-- /TMPL_IF -->
- </div>
  
- </form>
  
  
  <script language="JavaScript" type="text/javascript">
--- 198,216 ----
  					<!-- /TMPL_IF -->
  				</label></th>
! 				<td><input type="text" id="lastvalue1" name="lastvalue1" value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
! 				<td><input type="text" id="lastvalue2" name="lastvalue2" value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
! 				<td><input type="text" id="lastvalue3" name="lastvalue3" value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
  			</tr>
  		</table>
  </div>
  <!-- TMPL_IF name="mod" -->
! 	<input type="button" value="Save Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- TMPL_ELSE -->
! 	<input type="button" value="Add Subscription" onclick="Check(this.form); return false;" accesskey="w" class="submit" />
  <!-- /TMPL_IF -->
  
  
+ </form>
+ </div>
  
  <script language="JavaScript" type="text/javascript">




From oleonard at users.sourceforge.net  Mon Jan 10 18:07:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:07:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1 acqui-topmenu.inc,1.1,1.2
Message-ID: <E1Co30v-0000NV-IQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1375/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	acqui-topmenu.inc 
Added Files:
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:07:13 -0000	1.2
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 18:08:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 09:08:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes serials-topmenu.inc,NONE,1.1.2.1 acqui-topmenu.inc,1.1,1.1.2.1
Message-ID: <E1Co320-0000Sg-2u@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1761/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	acqui-topmenu.inc 
Added Files:
      Tag: rel_2_2
	serials-topmenu.inc 
Log Message:
Updating for inclusion of serials

--- NEW FILE ---
<div id="topmenu"><a href="/cgi-bin/koha/bull-home.pl">Serials Home</a> | <a href="/cgi-bin/koha/bull/subscription-add.pl">Add Subscription</a> | <a href="/cgi-bin/koha/bull/lateissues.pl">Late Issues</a></div>
Index: acqui-topmenu.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/acqui-topmenu.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acqui-topmenu.inc	8 Nov 2004 16:31:27 -0000	1.1
--- acqui-topmenu.inc	10 Jan 2005 17:08:36 -0000	1.1.2.1
***************
*** 1 ****
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a></div>
\ No newline at end of file
--- 1 ----
! <div id="topmenu"><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Cataloging Home</a> | <a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a> | <a href="/cgi-bin/koha/import/breeding.pl">MARC Import</a> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file




From oleonard at users.sourceforge.net  Mon Jan 10 22:33:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:33:57 -0800
Subject: [Koha-cvs] CVS: koha/admin marctagstructure.pl,1.25,1.26
Message-ID: <E1Co7Aj-0007XZ-Br@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28953/admin

Modified Files:
	marctagstructure.pl 
Log Message:
Moving HTML markup to the template

Index: marctagstructure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marctagstructure.pl,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** marctagstructure.pl	4 Oct 2004 20:37:14 -0000	1.25
--- marctagstructure.pl	10 Jan 2005 21:33:54 -0000	1.26
***************
*** 125,133 ****
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag",
! 								searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
  		$template->param('heading-add-tag-p' => 1);
  	}
--- 125,132 ----
  	if ($searchfield) {
  		$template->param(action => "Modify tag",
! 								searchfield => $searchfield);
  		$template->param('heading-modify-tag-p' => 1);
  	} else {
! 		$template->param(action => "Add tag");
  		$template->param('heading-add-tag-p' => 1);
  	}
***************
*** 225,231 ****
  		$row_data{mandatory} = $results->[$i]{'mandatory'};
  		$row_data{authorised_value} = $results->[$i]{'authorised_value'};
- 		$row_data{subfield_link} ="marc_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{edit} = "$script_name?op=add_form&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
- 		$row_data{delete} = "$script_name?op=delete_confirm&amp;searchfield=".$results->[$i]{'tagfield'}."&frameworkcode=".$frameworkcode;
  		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
--- 224,227 ----




From oleonard at users.sourceforge.net  Mon Jan 10 22:34:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:34:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marctagstructure.tmpl,1.27,1.28
Message-ID: <E1Co7BV-0007aj-Ks@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29153/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** marctagstructure.tmpl	19 Jul 2004 19:20:29 -0000	1.27
--- marctagstructure.tmpl	10 Jan 2005 21:34:42 -0000	1.28
***************
*** 147,153 ****
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->
--- 147,153 ----
  		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
  	</tr>
  	<!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:38:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:38:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.2,1.3
Message-ID: <E1Co7FS-0007r2-Uq@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30175/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Moving HTML markup from the script to the template

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marctagstructure.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
***************
*** 62,71 ****
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
- <!-- -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_VAR name="searchfield" --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
--- 62,70 ----
  <div id="main">	
  <!-- TMPL_IF name="add_form" -->
  	<h1><!-- TMPL_VAR name="action" --></h1>
  	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
  	<input type="hidden" name="op" value="add_validate" />
  	<table>
! 		<tr><td>Tag</td><td><!-- TMPL_IF NAME="searchfield" --><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR name="searchfield" --><!-- TMPL_ELSE --><input type="text" name="tagfield" size="3" maxlength="3" /><!-- /TMPL_IF --></td></tr>
  <tr><td>Lib for librarians</td><td><input type="text" name="liblibrarian" value="<!-- TMPL_VAR name="liblibrarian" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
  	<tr><td>Lib for opac</td><td><input type="text" name="libopac" value="<!-- TMPL_VAR name="libopac" escape="HTML" -->" size="80" maxlength="100" /></td></tr>
***************
*** 124,135 ****
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="<!-- TMPL_VAR name="subfield_link" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR name="edit" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem"><!-- TMPL_IF name="previous" --><!-- TMPL_VAR name="previous" -->&lt;&lt;Previous Tags</a><!-- TMPL_ELSE --><!-- /TMPL_IF -->
! <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR name="script_name" -->" method="post">
! 	<input type="hidden" name="op" value="add_form" /><input type="submit" value="Add tag" class="submit" /></form> <!-- TMPL_IF name="next" --><!-- TMPL_VAR name="next" -->Next Tags &gt;&gt;</a><!-- /TMPL_IF --></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 123,142 ----
  	<td><!-- TMPL_IF name="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
  	<td><!-- TMPL_VAR name="authorised_value" --></td>
! 	<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">subfields</a></td>
! 	<td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Edit</a> <a class="delete" href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->">Delete</a></td>
  </tr>
  <!-- /TMPL_LOOP -->
  </table>
! <div class="tabitem">		<!-- TMPL_IF NAME="isprevpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="&lt;&lt; Previous Page" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="hidden" name="op" value="add_form">
! 	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
! 		<input type="submit" class="submit" value="Add Tag"></form>		
! 		<!-- TMPL_IF NAME="nextpage" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" value="<!-- TMPL_VAR NAME="searchfield" -->" name="searchfield" /><input type="submit" value="Next Page &gt;&gt;" class="submit" /></form>
! 		<!-- /TMPL_IF --></div>
! <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Mon Jan 10 22:45:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 10 Jan 2005 13:45:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters marctagstructure.tmpl,1.3,1.4
Message-ID: <E1Co7M4-0008Ow-6D@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32267/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	marctagstructure.tmpl 
Log Message:
Minor correction to HTML

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** marctagstructure.tmpl	10 Jan 2005 21:38:48 -0000	1.3
--- marctagstructure.tmpl	10 Jan 2005 21:45:37 -0000	1.4
***************
*** 86,90 ****
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="form"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  
--- 86,90 ----
  	</tr>
  	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
! 	</table><div class="tabitem"><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Delete this Tag" class="cancel" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do not Delete" class="submit" /></form></div>
  <!-- /TMPL_IF -->
  




From acli at users.sourceforge.net  Tue Jan 11 10:33:22 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:33:22 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,NONE,1.1.2.1
Message-ID: <E1CoIOw-00033E-5R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11467

Added Files:
      Tag: rel_2_2
	update.pl 
Log Message:
update.pl emulation script


--- NEW FILE ---
#!/usr/bin/perl

# Convenience script to update a po file
# This emulates the GNOME "update.pl" script

use strict;
use integer;

my $lang = $ARGV[0];
die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;

my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/

for my $spec (['css', 'opac'], ['default', 'intranet']) {
   my($theme, $module) = @$spec;
   my $pid = fork;
   die "fork: $!\n" unless defined $pid;
   if (!$pid) {
      if ($chdir_needed_p) {
	 chdir('..') || die "..: cd: $!\n";
      }
      exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
      die "tmpl_process3.pl: exec: $!\n";
   }
   wait;
}





From acli at users.sourceforge.net  Tue Jan 11 10:40:45 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:40:45 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CoIW5-0003P7-Qn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13054

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Minor comment correction


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** update.pl	11 Jan 2005 09:33:19 -0000	1.1.2.1
--- update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
***************
*** 1,5 ****
  #!/usr/bin/perl
  
! # Convenience script to update a po file
  # This emulates the GNOME "update.pl" script
  
--- 1,5 ----
  #!/usr/bin/perl
  
! # Convenience script to update two po files at once
  # This emulates the GNOME "update.pl" script
  




From acli at users.sourceforge.net  Tue Jan 11 10:51:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Tue, 11 Jan 2005 01:51:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.2,1.1.2.3
Message-ID: <E1CoIg2-0003wx-B4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15036

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
More comments in the code to explain what it does
and check the language code command line argument a bit more carefully


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** update.pl	11 Jan 2005 09:40:38 -0000	1.1.2.2
--- update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
***************
*** 8,24 ****
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless defined $lang && $lang =~ /\S/;
  
! my $chdir_needed_p = 1 unless -d('po'); # guess if pwd is translator/ or po/
  
! for my $spec (['css', 'opac'], ['default', 'intranet']) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
!       exec('./tmpl_process3.pl', 'update', '-i', "../../koha-tmpl/$module-tmpl/$theme/en/", '-s', "po/${theme}_${module}_$lang.po", '-r');
        die "tmpl_process3.pl: exec: $!\n";
     }
--- 8,39 ----
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
! # Remember whether we see the "po" directory; this is used later to guess
! # whether the current directory is translator/po or translator.
! my $chdir_needed_p = 1 unless -d('po');
  
! # Go through the theme/module combinations we need to update. There can be
! # more than two; e.g., if we want ['default', 'opac'] too we can put it in
! for my $spec (
!       ['css',     'opac'    ],
!       ['default', 'intranet']
! ) {
     my($theme, $module) = @$spec;
     my $pid = fork;
     die "fork: $!\n" unless defined $pid;
     if (!$pid) {
+ 
+       # If current directory is translator/po instead of translator,
+       # then go back to the parent
        if ($chdir_needed_p) {
  	 chdir('..') || die "..: cd: $!\n";
        }
! 
!       # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
! 	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
! 
        die "tmpl_process3.pl: exec: $!\n";
     }




From shedges at users.sourceforge.net  Tue Jan 11 12:39:13 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Tue, 11 Jan 2005 03:39:13 -0800
Subject: [Koha-cvs] CVS: koha-doc/en/sysadmin/maintenance Updating_Koha.xml,1.1,1.2
Message-ID: <E1CoKMj-0001nf-I0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/en/sysadmin/maintenance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6898

Modified Files:
	Updating_Koha.xml 
Log Message:
minor change to cvs command following official 2.2.0 release

Index: Updating_Koha.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/en/sysadmin/maintenance/Updating_Koha.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Updating_Koha.xml	24 Dec 2004 15:44:59 -0000	1.1
--- Updating_Koha.xml	11 Jan 2005 11:39:09 -0000	1.2
***************
*** 6,10 ****
  
    <articleinfo>
!     <pubdate>2004-12-15</pubdate>
  
      <author>
--- 6,10 ----
  
    <articleinfo>
!     <pubdate>2005-01-11</pubdate>
  
      <author>
***************
*** 28,31 ****
--- 28,44 ----
          </revdescription>
        </revision>
+ 
+       <revision>
+         <revnumber>2.2.0p1</revnumber>
+ 
+         <date>2005-01-09</date>
+ 
+         <authorinitials>jmf</authorinitials>
+ 
+         <revdescription>
+           <para>Minor change to cvs command following official release of
+           2.2.0</para>
+         </revdescription>
+       </revision>
      </revhistory>
    </articleinfo>
***************
*** 173,177 ****
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co
      koha</userinput></para>
  
--- 186,190 ----
      the directory you have selected as the root directory for your CVS
      repository (mine is <filename>/build</filename>) and type: <userinput>cvs
!     -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/koha co -r rel_2_2
      koha</userinput></para>
  




From tipaul at users.sourceforge.net  Tue Jan 11 15:45:43 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 06:45:43 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115,1.115.2.1
Message-ID: <E1CoNHD-0002Ik-9S@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8822/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
bugfix : issn were not stored correctly in non-MARC DB on biblio modification

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115
retrieving revision 1.115.2.1
diff -C2 -r1.115 -r1.115.2.1
*** Biblio.pm	6 Jan 2005 14:32:17 -0000	1.115
--- Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
***************
*** 1602,1607 ****
  sub OLDmodbibitem {
      my ( $dbh, $biblioitem ) = @_;
- 
-     #    my $dbh   = C4Connect;
      my $query;
  
--- 1602,1605 ----
***************
*** 1609,1612 ****
--- 1607,1611 ----
      $biblioitem->{'url'}           = $dbh->quote( $biblioitem->{'url'} );
      $biblioitem->{'isbn'}          = $dbh->quote( $biblioitem->{'isbn'} );
+     $biblioitem->{'issn'}          = $dbh->quote( $biblioitem->{'issn'} );
      $biblioitem->{'publishercode'} =
        $dbh->quote( $biblioitem->{'publishercode'} );
***************
*** 1628,1631 ****
--- 1627,1631 ----
  url             = $biblioitem->{'url'},
  isbn            = $biblioitem->{'isbn'},
+ issn            = $biblioitem->{'issn'},
  publishercode   = $biblioitem->{'publishercode'},
  publicationyear = $biblioitem->{'publicationyear'},
***************
*** 1645,1650 ****
          warn "$query";
      }
- 
-     #    $dbh->disconnect;
  }    # sub modbibitem
  
--- 1645,1648 ----
***************
*** 2634,2637 ****
--- 2632,2638 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
+ # bugfix : issn were not stored correctly in non-MARC DB on biblio modification
+ #
  # Revision 1.115  2005/01/06 14:32:17  tipaul
  # improvement of speed for bulkmarcimport.




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/bull bull-home.tmpl,1.2,1.2.2.1 result.tmpl,1.4,1.4.2.1 subscription-detail.tmpl,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uN-Pl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/koha-tmpl/intranet-tmpl/default/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.tmpl	5 Aug 2004 16:35:43 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 15:07:59 -0000	1.2.2.1
***************
*** 24,28 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 24,28 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/result.tmpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** result.tmpl	2 Dec 2004 16:42:15 -0000	1.4
--- result.tmpl	11 Jan 2005 15:07:59 -0000	1.4.2.1
***************
*** 5,9 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
--- 5,9 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
  					<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
  				</a>
***************
*** 13,21 ****
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 13,21 ----
  					<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 					<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
***************
*** 48,52 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Get it!</a>
  				</td>
  			</tr>
--- 48,52 ----
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Get it!</a>
  				</td>
  			</tr>
***************
*** 57,61 ****
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
--- 57,61 ----
  		<p>
  			<!-- TMPL_IF NAME=displayprev -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_LOOP NAME=numbers -->
***************
*** 63,71 ****
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>
--- 63,71 ----
  				<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
  				<!-- TMPL_ELSE -->
! 				<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
  				<!-- /TMPL_IF -->
  			<!-- /TMPL_LOOP -->
  			<!-- TMPL_IF NAME=displaynext -->
! 			<a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
  				<!-- /TMPL_IF -->
  		</p>

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** subscription-detail.tmpl	2 Nov 2004 16:29:13 -0000	1.6
--- subscription-detail.tmpl	11 Jan 2005 15:07:59 -0000	1.6.2.1
***************
*** 6,9 ****
--- 6,12 ----
  <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Issues</a>
  <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Biblio</a>
+ <!-- TMPL_UNLESS name="totalissues" -->
+ 	<a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Delete subscription</a>
+ <!-- /TMPL_UNLESS -->
  <form method="post" name="f">
  <div id="bloc25">




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha MARCdetail.pl,1.25,1.25.2.1
Message-ID: <E1CoNcq-0003uJ-1v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926

Modified Files:
      Tag: rel_2_2
	MARCdetail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/MARCdetail.pl,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -r1.25 -r1.25.2.1
*** MARCdetail.pl	3 Jan 2005 12:57:21 -0000	1.25
--- MARCdetail.pl	11 Jan 2005 15:08:00 -0000	1.25.2.1
***************
*** 57,61 ****
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionfrom biblionumber
  use HTML::Template;
  
--- 57,61 ----
  use C4::Biblio;
  use C4::Acquisition;
! use C4::Bull; #uses getsubscriptionsfrombiblionumber
  use HTML::Template;
  
***************
*** 190,194 ****
  }
  
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
--- 190,194 ----
  }
  
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  $template->param(item_loop => \@item_value_loop,
  						item_header_loop => \@header_value_loop,
***************
*** 196,200 ****
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionid => $subscriptionid,
  						popup => $popup,
  						);
--- 196,200 ----
  						bibid => $bibid,
  						biblionumber => $biblionumber,
! 						subscriptionsnumber => $subscriptionsnumber,
  						popup => $popup,
  						);




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:04 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:04 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6,1.6.2.1
Message-ID: <E1CoNcq-0003uF-23@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** Bull.pm	3 Dec 2004 14:34:54 -0000	1.6
--- Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
***************
*** 45,49 ****
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &getsubscriptions &getsubscription &getsubscriptionfrombiblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
--- 45,50 ----
  
  @ISA = qw(Exporter);
! @EXPORT = qw(&newsubscription &modsubscription &delsubscription &getsubscriptions &getsubscription 
! 			&getsubscriptionfrombiblionumber &get_subscription_list_from_biblionumber
  			&modsubscriptionhistory
  			&getserials &serialchangestatus
***************
*** 137,150 ****
  	$sth = $dbh->prepare("insert into serial (serialseq,subscriptionid,biblionumber,status, planneddate) values (?,?,?,?,?)");
  	$sth->execute($serialseq, $subscriptionid, $val->{'biblionumber'}, 1, format_date_in_iso($startdate));
- 
- 	# next issue number
- 	#my ($newserialseq,$newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3) = Get_Next_Seq($val);
- 	# next date (calculated from actual date & frequency parameters)
- 	#my $nextplanneddate = Get_Next_Date($startdate,$val);
- # 	$sth = $dbh->prepare("update subscription set lastvalue1=?, lastvalue2=?,lastvalue3=?,
- # 													innerloop1=?,innerloop2=?,innerloop3=?
- # 													where subscriptionid = ?");
- # 	$sth->execute($newlastvalue1,$newlastvalue2,$newlastvalue3,$newinnerloop1,$newinnerloop2,$newinnerloop3,$subscriptionid);
- # 	$sth->finish;  
  	return $subscriptionid;
  }
--- 138,141 ----
***************
*** 167,176 ****
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select subscriptionid from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionid = $sth->fetchrow;
! 	return $subscriptionid;
  }
  
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
--- 158,186 ----
  	my ($biblionumber) = @_;
  	my $dbh = C4::Context->dbh;
! 	my $sth = $dbh->prepare('select count(*) from subscription where biblionumber=?');
  	$sth->execute($biblionumber);
! 	my $subscriptionsnumber = $sth->fetchrow;
! 	return $subscriptionsnumber;
  }
  
+ sub get_subscription_list_from_biblionumber {
+ 	my ($biblionumber) = @_;
+ 	my $dbh = C4::Context->dbh;
+ 	my $sth = $dbh->prepare('select subscription.*,subscriptionhistory.*,aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle 
+ 							from subscription 
+ 							left join subscriptionhistory on subscription.subscriptionid=subscriptionhistory.subscriptionid
+ 							left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid 
+ 							left join aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+ 							left join biblio on biblio.biblionumber=subscription.biblionumber 
+ 							where subscription.biblionumber = ?');
+ 	$sth->execute($biblionumber);
+ 	my @res;
+ 	while (my $subs = $sth->fetchrow_hashref) {
+ 		push @res,$subs;
+ 	}
+ 	return \@res;
+ }
+ 
+ 
  sub modsubscription {
  	my ($auser,$aqbooksellerid,$cost,$aqbudgetid,$startdate,
***************
*** 197,208 ****
  }
  
  sub getsubscriptions {
! 	my ($title,$ISSN) = @_;
! 	return unless $title or $ISSN;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 	$sth->execute("%$title%",$ISSN);
! 	my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
--- 207,235 ----
  }
  
+ sub delsubscription {
+ 	my ($subscriptionid) = @_;
+ 	# check again there is only one issue (the subscription is new)
+ 	my ($totalissues) = getserials($subscriptionid);
+ 	if ($totalissues eq 1) {
+ 		my $dbh = C4::Context->dbh;
+ 		$subscriptionid=$dbh->quote($subscriptionid);
+ 		$dbh->do("delete from subscription where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from subscriptionhistory where subscriptionid=$subscriptionid");
+ 		$dbh->do("delete from serial where subscriptionid=$subscriptionid");
+ 	}
+ }
  sub getsubscriptions {
! 	my ($title,$ISSN,$biblionumber) = @_;
! 	return unless $title or $ISSN or $biblionumber;
  	my $dbh = C4::Context->dbh;
  	my $sth;
! 	if ($biblionumber) {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and biblio.biblionumber=?");
! 		$sth->execute($biblionumber);
! 	} else {
! 		$sth = $dbh->prepare("select subscription.subscriptionid,biblio.title,biblioitems.issn,subscription.notes from subscription,biblio,biblioitems where  biblio.biblionumber = biblioitems.biblionumber and biblio.biblionumber=subscription.biblionumber and (biblio.title like ? or biblioitems.issn = ? )");
! 		$sth->execute("%$title%",$ISSN);
! 	}
! 		my @results;
  	while (my $line = $sth->fetchrow_hashref) {
  		push @results, $line;
***************
*** 217,221 ****
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription.
  sub getserials {
  	my ($subscriptionid) = @_;
--- 244,250 ----
  	$sth->execute($histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote,$subscriptionid);
  }
! # get every serial not arrived for a given subscription
! # as well as the number of issues registered in the database (all types)
! # this number is used to see if a subscription can be deleted (=it must have only 1 issue)
  sub getserials {
  	my ($subscriptionid) = @_;
***************
*** 230,234 ****
  		push @serials,$line;
  	}
! 	return @serials;
  }
  
--- 259,266 ----
  		push @serials,$line;
  	}
! 	$sth=$dbh->prepare("select count(*) from serial where subscriptionid=?");
! 	$sth->execute($subscriptionid);
! 	my ($totalissues) = $sth->fetchrow;
! 	return ($totalissues, at serials);
  }
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:08:31 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:08:31 -0800
Subject: [Koha-cvs] CVS: koha/bull statecollection.pl,1.3,1.3.2.1 subscription-detail.pl,1.5,1.5.2.1
Message-ID: <E1CoNdH-0003vz-EA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14926/bull

Modified Files:
      Tag: rel_2_2
	statecollection.pl subscription-detail.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** statecollection.pl	12 Aug 2004 14:36:07 -0000	1.3
--- statecollection.pl	11 Jan 2005 15:07:57 -0000	1.3.2.1
***************
*** 40,44 ****
  }
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");
--- 40,44 ----
  }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
  
  my $sth=$dbh->prepare("select * from subscriptionhistory where subscriptionid = ?");

Index: subscription-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/subscription-detail.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** subscription-detail.pl	20 Sep 2004 10:16:05 -0000	1.5
--- subscription-detail.pl	11 Jan 2005 15:07:58 -0000	1.5.2.1
***************
*** 70,75 ****
  }
  
  my $subs = &getsubscription($subscriptionid);
! my @serialslist = getserials($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 70,83 ----
  }
  
+ if ($op eq 'del') {
+ 	&delsubscription($subscriptionid);
+ 	print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=../bull-home.pl\"></html>";
+ 	exit;
+ 
+ }
  my $subs = &getsubscription($subscriptionid);
! my ($totalissues, at serialslist) = getserials($subscriptionid);
! $totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
! # the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)
  
  ($template, $loggedinuser, $cookie)
***************
*** 124,127 ****
--- 132,136 ----
  	subscriptionid => $subs->{subscriptionid},
  	serialslist => \@serialslist,
+ 	totalissues => $totalissues,
  	);
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:07 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:07 -0800
Subject: [Koha-cvs] CVS: koha/C4 SearchMarc.pm,1.36,1.36.2.1
Message-ID: <E1CoNfn-00047i-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15770/C4

Modified Files:
      Tag: rel_2_2
	SearchMarc.pm 
Log Message:
removing warning

Index: SearchMarc.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/SearchMarc.pm,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -C2 -r1.36 -r1.36.2.1
*** SearchMarc.pm	3 Jan 2005 10:48:36 -0000	1.36
--- SearchMarc.pm	11 Jan 2005 15:10:49 -0000	1.36.2.1
***************
*** 167,171 ****
  sub catalogsearch {
  	my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_;
- 	warn "@$tags[0], @$and_or[0], @$excluding[0], @$operator[0], @$value[0], $offset,$length,$orderby";
  	# build the sql request. She will look like :
  	# select m1.bibid
--- 167,170 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:11:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:11:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/circ circulation.tmpl,1.35,1.35.2.1
Message-ID: <E1CoNgC-0004AG-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15983/koha-tmpl/intranet-tmpl/default/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
circulation >> issue : showing borrowernumber code just after the borrower name.

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** circulation.tmpl	15 Dec 2004 10:47:10 -0000	1.35
--- circulation.tmpl	11 Jan 2005 15:11:29 -0000	1.35.2.1
***************
*** 32,37 ****
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
  				</a>
  			</p>
--- 32,37 ----
  			<h2 class="circulation">Borrower information</h2>
  			<p>
! 				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
! 					<!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
  				</a>
  			</p>




From tipaul at users.sourceforge.net  Tue Jan 11 16:13:39 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:13:39 -0800
Subject: [Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,NONE,1.1.2.1 buildEDITORS.pl,NONE,1.1.2.1
Message-ID: <E1CoNiF-0004Hu-Ng@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/migration_tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16469/misc/migration_tools

Added Files:
      Tag: rel_2_2
	build6xx.pl buildEDITORS.pl 
Log Message:
new migration tools :
* build6xx : script that build 6xx tags in authority list. Note this script is a framework, it MUST be tuned.
* buildEDITORS : script that build EDITORS authority file from biblios. Useful for unimarc_210c and uinmarc_225a plugins. run without parameters to get help.

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild thesaurus from biblio table.

# delete  FROM  `marc_subfield_table`  WHERE tag =  "606" AND subfieldcode = 9;
use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $field,$delete,$category,$subfields);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    's:s' => \$subfields,
    'v' => \$verbose,
    'c:s' => \$category,
);

if ($version || ($category eq '')) {
	print <<EOF
small script to recreate a authority table into Koha.
parameters :
\tc : thesaurus category. Can be filled with anything, the NC is hardcoded. But mandatory to confirm that you want to rebuild 6xx
\d : delete every entry of the selected category before doing work.

SAMPLES :
 ./build6xx.pl -c NC -d 
EOF
;#
die;
}

my $dbh = C4::Context->dbh;
my @subf = $subfields =~ /(##\d\d\d##.)/g;
if ($delete) {
	print "deleting thesaurus\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='NC'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='NC'");
	$dbh->do("delete from marc_subfield_table where tag='606' and subfieldcode='9'");
	$dbh->do("delete from marc_word where tagsubfield='6069'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;

# search biblios to "connect" to an authority with any number of $x (limited to 4 $x in this script)
my $sthBIBLIOS = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 where tag in (606) and subfieldcode='a' and subfieldvalue=?");
my $sthBIBLIOSx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=?");
my $sthBIBLIOSxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m3.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=?");
my $sthBIBLIOSxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=?");
my $sthBIBLIOSxxxx = $dbh->prepare("select distinct m1.bibid,m1.tag,m1.tagorder,m1.subfieldorder from marc_subfield_table as m1 left join marc_subfield_table as m2 on m1.bibid=m2.bibid left join marc_subfield_table as m3 on m1.bibid=m4.bibid left join marc_subfield_table as m4 on m1.bibid=m4.bibid left join marc_subfield_table as m5 on m1.bibid=m5.bibid where m1.tag in (606) and m1.subfieldcode='a' and m2.subfieldcode='x' and m3.subfieldcode='x' and m4.subfieldcode='x' and m5.subfieldcode='x' and m1.subfieldvalue=? and m2.subfieldvalue=? and m3.subfieldvalue=? and m4.subfieldvalue=? and m5.subfieldvalue=?");

# loop through each biblio
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $timeneeded = gettimeofday - $starttime;
	print "$i in $timeneeded s\n" unless ($i % 50);
	foreach my $field ($record->field(995)) {
		$record->delete_field($field);
	}
	my $totdone=0;
	my $authid;
	# search the 606 field(s)
	foreach my $field ($record->field("606")) {
		foreach my $authentry ($field->subfield("a")) {
			# the hashentry variable contains all $x fields and the $a in a single string. Used to differenciate
			# $xsomething$aelse and $asomething else
			my $hashentry = $authentry;
			foreach my $x ($field->subfield('x')) {
				$hashentry.=" -- $x";
			}
			# remove ?,?,$e...
			# all the same for mysql, but NOT for perl hashes !
			# without those lines, t?t is not tot and pat?e is not patee
			$hashentry =~ s/?|?|?/e/g;
			$hashentry =~ s/?|?/a/g;
			$hashentry =~ s/?/i/g;
			$hashentry =~ s/?/o/g;
			$hashentry =~ s/?|?/u/g;
			# uppercase all, in case of typing error.
			$hashentry = uc($hashentry);
			$totdone++;
			if ($alreadydone{$hashentry}) {
				$authid = $alreadydone{$hashentry};
				print ".";
			} else {
				print "*";
				#create authority.
				my $authorityRecord = MARC::Record->new();
				my $newfield = MARC::Field->new(250,'','','a' => "".$authentry);
				foreach my $x ($field->subfield('x')) {
					$newfield->add_subfields('x' => $x);
				}
				foreach my $z ($field->subfield('z')) {
					$newfield->add_subfields('z' => $z);
				}
				$authorityRecord->insert_fields_ordered($newfield);
				$authid=AUTHaddauthority($dbh,$authorityRecord,'','NC');
				$alreadydone{$hashentry} = $authid;
				# we have the authority number, now we update all biblios that use this authority...
				my @x = $field->subfield('x'); # depending on the number of $x in the subfield
				if ($#x eq -1) { # no $x
					$sthBIBLIOS->execute($authentry);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS->fetchrow) {
						# check that the field does not already have a $x (if it has, it will or has been managed by another authority
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						# loop in each 606 field
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							# and rebuild the $x -- $x -- $a string (like for $hashentry, few lines before)
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/?|?|?/e/g;
							$inEntry =~ s/?|?/a/g;
							$inEntry =~ s/?/i/g;
							$inEntry =~ s/?/o/g;
							$inEntry =~ s/?|?/u/g;
							$inEntry = uc($inEntry);
							# ok, it's confirmed that we must add the $9 subfield for this biblio, so...
							$isOK=1 if $inEntry eq $hashentry;
						}
						# ... add it !
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 0) { # one $x
					$sthBIBLIOSx->execute($authentry,$x[0]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/?|?|?/e/g;
							$inEntry =~ s/?|?/a/g;
							$inEntry =~ s/?/i/g;
							$inEntry =~ s/?/o/g;
							$inEntry =~ s/?|?/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 1) { # two $x
					$sthBIBLIOSxx->execute($authentry,$x[0],$x[1]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/?|?|?/e/g;
							$inEntry =~ s/?|?/a/g;
							$inEntry =~ s/?/i/g;
							$inEntry =~ s/?/o/g;
							$inEntry =~ s/?|?/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 2) { # 3 $x
					$sthBIBLIOSxxx->execute($authentry,$x[0],$x[1],$x[2]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/?|?|?/e/g;
							$inEntry =~ s/?|?/a/g;
							$inEntry =~ s/?/i/g;
							$inEntry =~ s/?/o/g;
							$inEntry =~ s/?|?/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x eq 3) { # 3 $x
					$sthBIBLIOSxxxx->execute($authentry,$x[0],$x[1],$x[2],$x[3]);
					while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOSxxxx->fetchrow) {
						my $inbiblio = MARCgetbiblio($dbh,$bibid);
						my $isOK = 0;
						foreach my $in606 ($inbiblio->field('606')) {
							my $inEntry = $in606->subfield('a');
							foreach my $x ($in606->subfield('x')) {
								$inEntry.=" -- $x";
							}
							$inEntry =~ s/?|?|?/e/g;
							$inEntry =~ s/?|?/a/g;
							$inEntry =~ s/?/i/g;
							$inEntry =~ s/?/o/g;
							$inEntry =~ s/?|?/u/g;
							$inEntry = uc($inEntry);
							$isOK=1 if $inEntry eq $hashentry;
						}
						C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
					}
				}
				if ($#x >4) {
					# too many $x, not handled, warn the developper that tries to migrate
					print "warning there is ".$#x.'$x values';
				}
			}
		}
	}
	$i++;
}
my $timeneeded = gettimeofday - $starttime;
print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";

--- NEW FILE ---
#!/usr/bin/perl
# script that rebuild EDITORS

use strict;

# Koha modules used
use MARC::File::USMARC;
use MARC::Record;
use MARC::Batch;
use C4::Context;
use C4::Biblio;
use C4::AuthoritiesMarc;
use Time::HiRes qw(gettimeofday);

use Getopt::Long;
my ( $input_marc_file, $number) = ('',0);
my ($version, $verbose, $test_parameter, $confirm,$delete);
GetOptions(
    'h' => \$version,
    'd' => \$delete,
    't' => \$test_parameter,
    'v' => \$verbose,
    'c' => \$confirm,
);

if ($version or !$confirm) {
	print <<EOF
small script to recreate a authority table into Koha.
This will parse all your biblios to recreate isbn / editor / collections for the unimarc_210c and unimarc_225a plugins.

Remember those plugins will work only if you have an EDITORS authority type, with
\t200a being the first 2 parts of an ISBN
\t200b being the editor name
\t200c (repeatable) being the series title

parameters :
\t-c : confirmation flag. the script will run only with this flag. Otherwise, it will just show this help screen.
\t-d : delete existing EDITORS before rebuilding them
\t-t : test parameters : run the script but don't create really the EDITORS
EOF
;#'

exit;
}

my $dbh = C4::Context->dbh;
if ($delete) {
	print "deleting EDITORS\n";
	my $del1 = $dbh->prepare("delete from auth_subfield_table where authid=?");
	my $del2 = $dbh->prepare("delete from auth_word where authid=?");
	my $sth = $dbh->prepare("select authid from auth_header where authtypecode='EDITORS'");
	$sth->execute;
	while (my ($authid) = $sth->fetchrow) {
		$del1->execute($authid);
		$del2->execute($authid);
	}
	$dbh->do("delete from auth_header where authtypecode='EDITORS'");
}

if ($test_parameter) {
	print "TESTING MODE ONLY\n    DOING NOTHING\n===============\n";
}
$|=1; # flushes output
my $starttime = gettimeofday;
my $sth = $dbh->prepare("select bibid from marc_biblio");
$sth->execute;
my $i=1;
my %alreadydone;
my $counter;
my %hash;
while (my ($bibid) = $sth->fetchrow) {
	my $record = MARCgetbiblio($dbh,$bibid);
	my $isbnField = $record->field('010');
	next unless $isbnField;
	my $isbn=$isbnField->subfield('a');
	my $seg1;
	if(substr($isbn, 0, 1) <=7) {
		$seg1 = substr($isbn, 0, 1);
	} elsif(substr($isbn, 0, 2) <= 94) {
		$seg1 = substr($isbn, 0, 2);
	} elsif(substr($isbn, 0, 3) <= 995) {
		$seg1 = substr($isbn, 0, 3);
	} elsif(substr($isbn, 0, 4) <= 9989) {
		$seg1 = substr($isbn, 0, 4);
	} else {
		$seg1 = substr($isbn, 0, 5);
	}
	my $x = substr($isbn, length($seg1));
	my $seg2;
	if(substr($x, 0, 2) <= 19) {
# 		if(sTmp2 < 10) sTmp2 = "0" sTmp2;
		$seg2 = substr($x, 0, 2);
	} elsif(substr($x, 0, 3) <= 699) {
		$seg2 = substr($x, 0, 3);
	} elsif(substr($x, 0, 4) <= 8399) {
		$seg2 = substr($x, 0, 4);
	} elsif(substr($x, 0, 5) <= 89999) {
		$seg2 = substr($x, 0, 5);
	} elsif(substr($x, 0, 6) <= 9499999) {
		$seg2 = substr($x, 0, 6);
	} else {
		$seg2 = substr($x, 0, 7);
	}
	$counter++;
	print ".";
	my $timeneeded = gettimeofday - $starttime;
	print "$counter in $timeneeded s\n" unless ($counter % 50);
	
	my $field = $record->field('210');
	my $editor;
	$editor=$field->subfield('c') if $field;
	
	$field = $record->field('225');
	my $collection;
	$collection=$field->subfield('a') if $field;
	
	print "WARNING : editor empty for ".$record->as_formatted unless $editor and !$verbose;

	$hash{$seg1.$seg2}->{editors} = $editor unless ($hash{$seg1.$seg2}->{editors});
	$hash{$seg1.$seg2}->{collections}->{$collection}++ if $collection;
}

foreach my $isbnstart (sort keys %hash) {
	print "$isbnstart -- ".$hash{$isbnstart}->{editors} if $verbose;
	my $collections = $hash{$isbnstart}->{collections};
	my $seriestitlelist;
	foreach my $collection (sort keys %$collections) {
		print " CC $collection : ".$collections->{$collection} if $verbose;
		$seriestitlelist.=$collection."|";
	}
	my $authorityRecord = MARC::Record->new();
	my $newfield = MARC::Field->new(200,'','','a' => "".$isbnstart,
												'b' => "".$hash{$isbnstart}->{editors},
												'c' => "".$seriestitlelist);
	$authorityRecord->insert_fields_ordered($newfield);
	my $authid=AUTHaddauthority($dbh,$authorityRecord,'','EDITORS');

# 	print $authorityRecord->as_formatted."\n";
	print "\n" if $verbose;
}
exit;

# 	my $timeneeded = gettimeofday - $starttime;
# 	print "$i in $timeneeded s\n" unless ($i % 50);
# 	foreach my $field ($record->field(995)) {
# 		$record->delete_field($field);
# 	}
# 	my $totdone=0;
# 	my $authid;
# 	foreach my $fieldnumber (('710','711','712')) {
# 		foreach my $field ($record->field($fieldnumber)) {
# 	# 		print "=>".$field->as_formatted."\n";
# 			foreach my $authentry ($field->subfield("a")) {
# 				my $hashentry = $authentry;
# 				# la particularit? de ce script l?, c'est que l'entr?e dans la table d'autorit? est $a -- $b (et pas $x -- $x -- $x -- $a comme pour les autorit?s NC)
# 				# si n?cessaire, compl?ter avec le $c (n'existe pas dans le fichier que j'ai migr? avec cette moulinette
# 				# supprimer les accents, certaines entr?es sont sans, d'autres avec !
# 				# mysql ne diff?rencie pas, mais les hash perl oui !
# 				$hashentry =~ s/?|?|?/e/g;
# 				$hashentry =~ s/?|?/a/g;
# 				$hashentry =~ s/?/i/g;
# 				$hashentry =~ s/?/o/g;
# 				$hashentry =~ s/?|?/u/g;
# 				$hashentry = uc($hashentry);
# 				print "==>$hashentry" if $hashentry =~ /.*ETATS.*/;
# 				$totdone++;
# 				if ($alreadydone{$hashentry}) {
# 					$authid = $alreadydone{$hashentry};
# 					print ".";
# 				} else {
# 					print "*";
# 					#create authority.
# 					my $authorityRecord = MARC::Record->new();
# 					my $newfield = MARC::Field->new(210,'','','a' => "".$authentry, 
# 												'b' => "".$field->subfield('b'),
# 												'c' => "".$field->subfield('c'),
# 												);
# 					$authorityRecord->insert_fields_ordered($newfield);
# 					$authid=AUTHaddauthority($dbh,$authorityRecord,'','CO');
# 					$alreadydone{$hashentry} = $authid;
# 					# OK, on garde la notice d'autorit?, on cherche les notices biblio et on les met ? jour...
# 					if ($fieldnumber eq '710') {
# 						$sthBIBLIOS710->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS710->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr?e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/?|?|?/e/g;
# 								$inEntry =~ s/?|?/a/g;
# 								$inEntry =~ s/?/i/g;
# 								$inEntry =~ s/?/o/g;
# 								$inEntry =~ s/?|?/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '711') {
# 						$sthBIBLIOS711->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS711->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr?e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/?|?|?/e/g;
# 								$inEntry =~ s/?|?/a/g;
# 								$inEntry =~ s/?/i/g;
# 								$inEntry =~ s/?/o/g;
# 								$inEntry =~ s/?|?/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 					if ($fieldnumber eq '712') {
# 						$sthBIBLIOS712->execute($authentry);
# 						while (my ($bibid,$tag,$tagorder,$subfieldorder) = $sthBIBLIOS712->fetchrow) {
# 							my $inbiblio = MARCgetbiblio($dbh,$bibid);
# 							my $isOK = 0;
# 							foreach my $in7xx ($inbiblio->field($fieldnumber)) {
# 								# !!!!! ici, il faut reconstruire l'entr?e de la table de hachage comme ci dessus
# 								# sinon, 
# 								my $inEntry = $in7xx->subfield('a');
# 								$inEntry =~ s/?|?|?/e/g;
# 								$inEntry =~ s/?|?/a/g;
# 								$inEntry =~ s/?/i/g;
# 								$inEntry =~ s/?/o/g;
# 								$inEntry =~ s/?|?/u/g;
# 								$inEntry = uc($inEntry);
# 								$isOK=1 if $inEntry eq $hashentry;
# 							}
# 							C4::Biblio::MARCaddsubfield($dbh,$bibid,$tag,'',$tagorder,9,$subfieldorder,$authid) if $isOK;
# 						}
# 					}
# 				}
# 			}
# 		}
# 	}
# 	$i++;
# }
# my $timeneeded = gettimeofday - $starttime;
# print "$i entries done in $timeneeded seconds (".($i/$timeneeded)." per second)\n";




From tipaul at users.sourceforge.net  Tue Jan 11 16:23:49 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:23:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/release notes release_notes_221.txt,NONE,1.1.2.1
Message-ID: <E1CoNs5-000596-0q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/release notes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19761/misc/release notes

Added Files:
      Tag: rel_2_2
	release_notes_221.txt 
Log Message:
release notes for 2.2.1

***** Bogus filespec: notes
--- NEW FILE ---
RELEASE NOTES
=============

Koha is the 1st Open-Source Integrated Library System.
Released at first in New zealand, in 2000 januaray, it is maintained by a team of volunteers from around the globe, the Koha system is a full catalogue, opac, circulation and acquisitions system.

Koha 2.2 is more than 247 000 lines of code, developped by more than 30 differents developpers (excluding translators).

With the 2.2 version, Koha is now a mature product, with a lot of nice features. It's used in more than 50 libraries, from all kinds (public, schools, search, religious...), of all size (from 1 to 8 branches, from 1000 to 300 000 items).

========
WARNINGS
========
* the librarian interface is tested only with mozilla/firefox. Should work (partially) with IE. OPAC should work fine with any navigator.
* Any 2.1.x install must be uninstalled before installing 2.2.0 No update is provided for 2.1.0.

=======
DIFFS
=======
Diff 2.2.0 => 2.2.1
*******************
BUGFIXES

***** Critical

***** Minor
* in serials module >> add subscription >> select biblio : The next / previous page were invalid.
* in serials module >> add subscription >> select biblio : impossible to report the biblio when there is a quote in it (' was not escaped)
* issn were not stored correctly in non-MARC DB on biblio modification

IMPROVEMENTS
***** Major
* serial subscriptions : modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.
* serial subscriptions : you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)
**** Minor
* adding publicationyear and series title in opac advanced search form
* in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title
* circulation >> issue : showing borrowernumber code just after the borrower name.

Diff 2.2RC5 => 2.2.0
********************
BUGFIXES

***** Critical
* rolling back lock_tables_privs = 'Y' during install stage (too many problems) The option is shown in bulkmacimport instead.
* bugfix for the search on a MARC detail, when you clic on the magnifying glass (caused an internal server error)

***** Minor
* error in authority => biblio 'jumper' that make the jump fail (was a remaining ')
* when modifying a biblio, on a repeated field with many subfields, the test to show empty subfields in X>1 was wrong : the missing subfields of the 1st field were repeated.
Example :
606 has $a$x$z
1st is 606$a (so $x$z empty)
2nd is 606$a$x
The marc editor in the 2nd field showed before this fix :
606 $a a_value
   $x another_value
   $x
   $z
(the 2nd $x being useless)
* Authorities : Minor changes in summary "exploding" (the 3 digits AFTER the subfield were not on the right place).
* partial support of the "linkage" MARC feature : if you enter a "link" on a MARC subfield, the magnifying glass won't search on the field, but on the linked field. I agree it's a partial support. Will be improved, but I need to investigate MARC21 & UNIMARC diffs on this topic.
IMPROVEMENTS

***** Major
* New systempref parameter : opacstylesheet If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)
* improvements in shelves management in OPAC (synch'ing with librarian interface) : the user can modify a bookshelf, add a book into a bookshelf from the biblio, create a bookshelf "on the fly", from the bookshelf popup.
* new directory migration_tools in $KOHA/misc Will store various migration tools. bulkmarcimport has been moved here.

**** Minor
* minor change in MARCdetail : when a field is repeated, the field header is not repeated but replaced by a nice little empty space.

Diff 2.2RC4 => 2.2RC5
*********************

BUGFIXES

***** Critical
* limiting the number of search term to 8. There was no limit before, but 8 words seems to be the upper limit mySQL can deal with (in less than a second. tested on a DB with 13 000 items) In 2.4, a new DB structure will highly speed things and this limit will be removed. FindDuplicate is activated again.
* bugfixes in french translation (that made cataloguing in french impossible)
* set lock_tables_privs = 'Y' during install stage. Note this requires a mysql version not too old.

***** Minor
* during update, if the user enter a different directory for backup than the default one, the updater does not obey and stores in default directory anyway !
* minor (spelling) fix for adding an organization
* member search (bug 851) : stripping out comma and apostrophe from search terms
* various methods to split subjects (depending on OS, a <CR> / <CR><LF> problem)

IMPROVEMENTS

***** Major
* circulation / issue : adding a button to cancel an issue when a confirmation is required (bug #858)
* circulation / issue : adding a checkbox to confirm reserve cancel when a reserved book is issued by someone else (bug #858)
* virtual shelves : adding feature to create a virtual shelf on the fly, when adding a biblio, and feature to modify a virtual shelf name/status
* catalogue : adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd

**** Minor
* an improvement has been done in DB calls that needs a new index. It's automatically added in fresh installs, but for updates, run the following SQL command :
ALTER TABLE `marc_subfield_structure` ADD INDEX ( `kohafield` ) 
* adding a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* the list of authorities types is now ordered by authtypetext. Thus you can use the "space trick" : if you add a space before an authtype text, it's shown first. Useful when you have an authority type that you use more often than others.
* authoritiy list shown in authtypetext order (so authtypetext with a space appear first, hint used everywhere else for lists)
* some minor html changes (like changing "images" numbers in "text" numbers for result list page numbers.

Diff 2.2RC3 => 2.2RC4
*********************
BUGFIXES

***** Critical
1 CRITICAL bug in acquisition (another one...) : when MARC=ON, and an order line is created from an existing biblio (to buy another item), the MARC biblio is lost and replaced by the non marc one (that has a lot less informations...). To solve the problem, the biblio can no more be modified after the order has been placed. Less feature, but more reliable ! (not simple solution to solve this problem. Would imply to rewrite the MARC biblio from the non marc datas, and no API is provided for this yet)
2 CRITICAL bugfix in Biblio.pm, removing &branches declaration (was due to an untested cvs rollback, opac-search.pl was crashing)
3 CRITICAL bugfix in Biblio.pm when MARC=OFF. subjects were stored and immediatly deleted. And not stored correctly in MARC part of the biblio. (thanks to Waylon Robertson)

***** Minor
1 bugfix in updatedatabase (auth_header creation table). Don't affect previous install of 2.2, only upgrades 2.0 => 2.2
2 reading rec : Fixing link to toggle between full and limited display
3 bugfix for moremember.pl that no longer outputed item type for issues
4 defaulting actual cost to estimated cost (was 0 by default)
5 bugfix : in biblio search, - and other signs where not properly managed. Leroy-Beaulieu could not be found
6 the popup of the 210c plugin closes when a collection is choosed
7 bugfix : could not select a biblio in subscription creation if the book was not for loan
8 minor fixes in spelling in subscription
9 adding acquisition in default userflags. This flag can be set for librarians that have access to acquisition
10 in subscription enddate calculation, bugfix when subscription based on number of issues (worked when based on subscription length)
11 in subscription next issue date calculation, bugfix when subscription frequency is 1/quarter.
12 datelastseen is updated when the book is returned
13 moredetail.pl shows incorrect date, incorrectly formatted (bug #689)
14 DuplicateFinder has been disabled : sometimes goes into a looonnnggg lasting loop.
15 when a query returns only one result, adding it to basket did not work.
16 deletion of a suggestion was buggy. Now fixed
17 for installation of Koha under Windows there is a bug with subject splitting. Now fixed. (thanks to Waylon Robertson)

IMPROVEMENTS
***** Major
1 a lot in book shelves
2 Submitting with no barcode in issues should clear for next patron (bug #865)
3 screen added to see late issues from a given bookseller
4 Koha should now work under mod_perl (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)

**** Minor
1 show also item tags into marc list of fields (in librarian search interface)
2 email sent basket : the sender can give it's name, in case the basket is sent to a friend, not to itself
3 removing useless string in isbd view
4 cataloguing, in isbnsearch, after searching a title/ISBN, the librarian can choose the framework (+ it's a cataloguing screen, not an acquisition one)
5 serials : in issues management, the waited/late issues bloc is before the collection state bloc.
6 serials : the intranet note has been removed, it's useless
7 after an authority is added/modified, go to this fresh authority (instead of authority-home)
8 search option in auth-top
9 in OPAC, the itemcallnumber search is a "start by" search (was a contains)
10 opac note is defaulted to '' (was 0, that means nothing)
11 adding blank to relshiploop (altrelationship) loop (Bug ???)
12 when deleting an itemtype, don't check issuingrules, but delete them too
13 For MARC=OFF installation, Waylon submitted a script to rebuild MARC part of the catalogue. It's in misc/updatemarc_subjects.pl (thanks to Waylon Robertson)

Diff 2.2RC2 => 2.2RC3
*********************
* CRITICAL bug in acquisition : biblio badly stored in MARC part of Koha, deleting another biblio...
* CRITICAL problem : the duplicate finder (when adding a biblio) has performances problems under certains circumstances.
* bug #862 fixed : Upgrade does not work (from 2.2RC1 to 2.2RC2)
* bugfix in acquisition, when a line is modified, aqorderbreakdown was duplicated. (Seems it was a mysql return value depending on mysql version)
* bugfix in setting user permissions (they were stored, but not shown correctly after)
* bugfix in translation error for basket sent in OPAC
* bugfix in 225a plugin (editor chooser)
* adding itemcallnumber entry in systempreferences during install
* error in biblio detail showing when MARC=ON (bug from RC2, did not exist before)
* bug in acceptorreject OPAC suggestion (bug from RC2, did not exist before)
* Not really a bug but : stopword must not be empty. If it's empty, the search fail.
* During install, the user can load french and english stopwords if he want.
* French librarian interface seems OK
* addbook (1st page when MARC=ON) is a catalogue screen, not an acquisition one
* The barcode is shown in the list of books issued by a borrower in opac-user page.

Diff 2.2RC1 => 2.2RC2
*********************
* bugfix for import in reservoir : title and isbn where not extracted.
* bugfix in OPAC : it was possible to reserve books that where "notforloan"
* bugfix in circulation : no warning when a reserve was made on a book that you try to issue to someone else. 
* bugfix & improvement for catalogue management behaviour when MARC=OFF
* bugfix in bookshelves (in CVS, probably not in official tar.gz)
* bugfix in online help (in CVS, probably not in official tar.gz)

=============
INSTALLATION
=============
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./installer.pl
* READ and FOLLOW the instructions

READING what is on screen during installation is VERY important. Some decisions you make during install stage are very hard to reproduce after.


UPGRADE from previous 2.0.0preX or RCx version
*******
* Download the package
* tar xvfz koha-version.tar.gz
* cd koha-version
* ./koha.upgrade
* Follow the instructions

UPGRADE from previous 1.2.x version :
********
UPGRADE TO A 2.0.0 version before upgrading

UPGRADE from a 2.1.x version is NOT AVAILABLE. Don't install 2.2 on a 2.1.x test database. A lot of DB changes have been done since 2.1.x & cannot be handled by the DB updater.

=============
NEW FEATURES
=============
Koha 2.2 has, of course, all the previous features from Koha (acquisition, cataloguing, circulation, members modules, OPAC, complete MARC support...) plus the following new ones :

General :
*********
* (almost) complete rewrite of librarian GUI : now Koha uses CSS, and is easier to use. However, users of Koha 2.0.0 won't be lost, as the general organisation of the product has not changed.
* Online Help : an online help is available everywhere in the librarian interface. It's complete in the parameters section of Koha and for new features. It will be completed for the rest of the product.
* Better LDAP suport : Koha 2.2 can be "connected" to a LDAP server and get all borrower informations from there (including borrower category where applicable). However, to avoid problems for libraries without LDAP server, the LDAP features have been stored in modules/C4/Auth_with_ldap.pm file. The standard Auth.pm don't use it. If you want LDAP, just perldoc Auth_with_ldap.pm and manually tune your Auth package !
* Auto installer : if you install koha with ./install -i /path/to/auto_install_file, then Koha will be installed almost without question. A very usefull feature for developpers that want to install/uninstall Koha quite often. A sample of auto_install_file is provided in misc/auto_install_file.
* Uninstaller : run misc/uninstall.pl, provide the mysql root password. that's all. Koha is completely deleted and can be reinstalled. With the previous feature, it's a very nice solution for test platform.
* mod_perl : Koha should now work under mod_perl, that gives a big performance boost (Release Manager don't use mod_perl. fixes comes from A. Tarallo, Argentina, that ensure Koha works fine with mod_perl with the patches applied)
* Nelsonville have shared their templates. They are available as NPL theme.
* Language : in this version, only english and french versions are fully functionnal. Spanish and chinese are provided, but not fully functionnal. Polish, German, Arabic, Hebrew, and many other languages have volunteers and should be here in a future 2.2.x


BE CAREFUL with uninstaller : 
1- This script does not ask for confirmation after mysql root password.
2- This script uses /etc/koha.conf. If you have more than 1 koha on your server, use /etc/koha.conf for a "deletable-test" one.

Acquisition :
*************
* suggestion : borrowers can suggest items to buy in OPAC. Then, the librarian can manage (accept or refuse) and order them.
* possibility to close a basket, he can't be modified then
* order a basket by publisher or by bookfund/publisher
* search order history

Cataloguing :
*************
* Cataloguing frameworks : you can define as many frameworks as you want. A framework describes how a material is catalogued (which fields, subfields, which constraints on them...)
* MARC authorities : Koha now supports authorities in MARC. You can define the MARC structure for authorities like for biblios.
* New contraints can be set for subfields :
  - subfield is hidden : appears in MARC editor, but not in OPAC.
  - subfield is an URL : the field can be cliqued
  - related fields : a search made on a subfield also uses other subfields automatically. Using this feature, a search on "title" can search title, but also subtitle, uniform title,...
* Item location can now be done on 3 levels : the branch, the location (room), the callnumber.
* The callnumber can now be calculated from the LC, the dewey, or be freely (and manually) entered.
* Duplicate finder : this powerful feature help your cataloguers avoiding duplicate biblios.
* ISBD view : in librarian interface as well as in OPAC biblios can be shown in standard (default) presentation, in MARC (human readable) or ISBD. The ISBD view can be tuned by the librarian team. There is also a systempref to define default view in OPAC (either normal, MARC or ISBD). Created automatically during install or update. Check that you have a Koha >> parameters >> systempreferences >> BiblioDefaultView, Variable type : Choice, Variable options : normal|marc|isbd
* UNIMARC plugin for every 1xx fields : ESNMP have developped all the plugins for UNIMARC fields 1xx. Those fields are coded fields.

Serial cataloguing :
********************
Koha 2.2 manage serial subscriptions and issuing of those subscriptions. (Only a few words to describe a very important & complete module !)

Catalogue search :
******************
* Search in OPAC and librarian interface has been improved. They now are exactly the same.
* Spelling suggestion : before sending a request, the user can ask for spelling suggestion. This shows other forms of words entered that would give results. Give poor results for instance, the Koha team is thinking to a true spellchecking.
* The user can select the order of the results and the number of results shown.

Members :
*********
* The borrowernote field is shown on issue and transfer.
* The textmessaging field appears in OPAC when the user logs in.

Circulation :
*************
* New issuing rules : Issuing can be set for branch / borrower type / item category, by number of days and number of items available.
* "joker" issuing rules : the library can set issuing rules for "any branch" or "any borrower type", or "any item category".
Both issuing rules are cumulative : a library can set issuing rules to 10 books, 5 CD, but 12 total (books or CD).

OPAC :
******
In Koha 2.2, koha has :
* baskets. A basket can be printed or sent by mail to the borrower
* virtual shelves : a virtual shelf can be created and filled by any logged borrower. A given virtual shelf can be private or public. Or even free-for-all.
* language chooser : the borrower can change the language on the fly. The default language being still choosen by the library
* complete CSS definition. With a new systempref parameter : opacstylesheet. If this parameter is set to a stylesheet URL, this stylesheet will be used instead of the opactheme one. With this parameter, you can have your own stylesheet for OPAC, that will be used and kept when you update your version of Koha. The systempref must be a complete URL (http://www.koha.org/stylesheet/somestylesheet.css for example)

Barcode printing :
******************
A new module has been added to the parameters section : barcode printing. It requires the PDF::Api2 Perl package and can print barcode on 

============
Koha Future
============
The future of Koha is being discussed on mailing lists and on koha wiki : http://www.saas.nsw.edu.au/koha_wiki/index.php?page=KohaRoadmap2.2.x




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:16 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.15.2.1 opac-serial-issues.tmpl,1.2,1.2.2.1
Message-ID: <E1CoNsW-0005Bz-U5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl opac-serial-issues.tmpl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -C2 -r1.15 -r1.15.2.1
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
***************
*** 130,137 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionid" -->
  		<p>
! 			This is a serial subscription. You can see which 
! 				<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have
--- 130,137 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
  		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
  					Issues
  				</a> we have and don't have

Index: opac-serial-issues.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-serial-issues.tmpl	13 Aug 2004 05:54:55 -0000	1.2
--- opac-serial-issues.tmpl	11 Jan 2005 15:24:14 -0000	1.2.2.1
***************
*** 5,9 ****
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <div id="bloc25">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
--- 5,10 ----
  <a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
  <form method="post" name="f">
! <!-- TMPL_LOOP name="subscription_LOOP" -->
! <div id="bloc60">
  	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
  		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
***************
*** 75,84 ****
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<h2 class="catalogue">Issues summary</h2>
! 	<p>
! 		<!-- TMPL_VAR name="opacnote" -->
! 	</p>
  </div>
! 
  </div>
  
--- 76,87 ----
  		</p>
  		<p><!-- TMPL_VAR name="notes" --></p>
! 	<!-- TMPL_IF name="opacnotes" -->
! 		<h2 class="catalogue">Issues summary</h2>
! 		<p>
! 			<!-- TMPL_VAR name="opacnote" -->
! 		</p>
! 	<!-- /TMPL_IF -->
  </div>
! <!-- /TMPL_LOOP -->
  </div>
  




From tipaul at users.sourceforge.net  Tue Jan 11 16:24:18 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:24:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.14.2.1 opac-serial-issues.pl,1.1,1.1.2.1
Message-ID: <E1CoNsY-0005CB-HC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19933/opac

Modified Files:
      Tag: rel_2_2
	opac-detail.pl opac-serial-issues.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	11 Jan 2005 15:24:14 -0000	1.14.2.1
***************
*** 30,34 ****
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionid = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
--- 30,34 ----
  my ($webbiblioitemcount, @webbiblioitems) = &getwebbiblioitems($biblionumber);
  my ($websitecount, @websites)             = &getwebsites($biblionumber);
! my $subscriptionsnumber = getsubscriptionfrombiblionumber($biblionumber);
  
  $dat->{'count'}=@items;
***************
*** 71,75 ****
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionid => $subscriptionid,
  );
  
--- 71,75 ----
  				WEB_RESULTS => $webarray,
  				SITE_RESULTS => $sitearray,
! 				subscriptionsnumber => $subscriptionsnumber,
  );
  

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-serial-issues.pl	12 Aug 2004 14:50:29 -0000	1.1
--- opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
***************
*** 18,25 ****
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my ($subscriptionid);
! 
! $subscriptionid = $query->param('subscriptionid');
! my $subscription = &getsubscription($subscriptionid);
  
  ($template, $loggedinuser, $cookie)
--- 18,23 ----
  # my $id;
  my ($template, $loggedinuser, $cookie);
! my $biblionumber = $query->param('biblionumber');
! my $subscriptions = get_subscription_list_from_biblionumber($biblionumber);
  
  ($template, $loggedinuser, $cookie)
***************
*** 32,57 ****
  
  # replace CR by <br> in librarian note
! $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	startdate => format_date($subscription->{startdate}),
! 	periodicity => $subscription->{periodicity},
! 	dow => $subscription->{dow},
! 	numberlength => $subscription->{numberlength},
! 	weeklength => $subscription->{weeklength},
! 	monthlength => $subscription->{monthlength},
! 	opacnote => $subscription->{opacnote},
! 	numberingmethod => $subscription->{numberingmethod},
! 	arrivalplanified => $subscription->{arrivalplanified},
! 	status => $subscription->{status},
! 	biblionumber => $subscription->{biblionumber},
! 	bibliotitle => $subscription->{bibliotitle},
! 	notes => $subscription->{notes},
! 	subscriptionid => $subscription->{subscriptionid}
  	);
! $template->param(
! 			"periodicity$subscription->{periodicity}" => 1,
! 			"arrival$subscription->{dow}" => 1,
! 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 30,56 ----
  
  # replace CR by <br> in librarian note
! # $subscription->{opacnote} =~ s/\n/\<br\/\>/g;
  
  $template->param(
! 	subscription_LOOP => $subscriptions
! # 	startdate => format_date($subscription->{startdate}),
! # 	periodicity => $subscription->{periodicity},
! # 	dow => $subscription->{dow},
! # 	numberlength => $subscription->{numberlength},
! # 	weeklength => $subscription->{weeklength},
! # 	monthlength => $subscription->{monthlength},
! # 	opacnote => $subscription->{opacnote},
! # 	numberingmethod => $subscription->{numberingmethod},
! # 	arrivalplanified => $subscription->{arrivalplanified},
! # 	status => $subscription->{status},
! # 	biblionumber => $subscription->{biblionumber},
! # 	bibliotitle => $subscription->{bibliotitle},
! # 	notes => $subscription->{notes},
! # 	subscriptionid => $subscription->{subscriptionid}
  	);
! # $template->param(
! # 			"periodicity$subscription->{periodicity}" => 1,
! # 			"arrival$subscription->{dow}" => 1,
! # 			);
  
  output_html_with_http_headers $query, $cookie, $template->output;




From tipaul at users.sourceforge.net  Tue Jan 11 16:31:08 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:31:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-basket.tmpl,1.3,1.3.2.1
Message-ID: <E1CoNzA-0005fg-0J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21772/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-basket.tmpl 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: opac-basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-basket.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.tmpl	13 Aug 2004 05:54:55 -0000	1.3
--- opac-basket.tmpl	11 Jan 2005 15:31:04 -0000	1.3.2.1
***************
*** 21,25 ****
  				<tr>
  					<th>
! 						<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
  					</th>
  				</tr>
--- 21,25 ----
  				<tr>
  					<th>
! 						<a onClick="javascript:openBiblio(<!-- TMPL_VAR name="biblionumber" -->)"><!-- TMPL_VAR NAME="title" --></a>
  					</th>
  				</tr>




From tipaul at users.sourceforge.net  Tue Jan 11 16:32:40 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11,1.11.2.1
Message-ID: <E1CoO0e-0005mP-K1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22197/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
* adding series title and publication year limits in opac-search form.
* minor html improvement

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -r1.11 -r1.11.2.1
*** opac-search.tmpl	2 Dec 2004 16:46:48 -0000	1.11
--- opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
***************
*** 6,10 ****
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc20">
  		<h2 class="catalogue">Search on</h2>
  		<p>
--- 6,10 ----
  <form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
  	
! 	<div id="bloc60">
  		<h2 class="catalogue">Search on</h2>
  		<p>
***************
*** 42,45 ****
--- 42,53 ----
  		</p>
  		<p>
+ 			<label class="label20">Series title</label>
+ 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="contains" />
+ 			<input type="text" name="value" onchange="sql_update()" size="35"/>
+ 		</p>
+ 		<p>
  			<label class="label20">Item Type</label>
  			<input type="hidden" name="marclist" value="biblioitems.itemtype" />
***************
*** 95,98 ****
--- 103,120 ----
  			<input type="text" name="value" onchange="sql_update()" />
  		</p>
+ 		<p>
+ 			<label class="label20">Published between</label>
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value=">=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 			and
+ 			<input type="hidden" name="marclist" value="biblioitems.publicationyear" />
+ 			<input type="hidden" name="and_or" value="and" />
+ 			<input type="hidden" name="excluding" value="" />
+ 			<input type="hidden" name="operator" value="<=" />
+ 			<input type="text" name="value" size="6" maxlength="4" onchange="sql_update()" />
+ 		</p>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 112,117 ****
  			</select>
  		</p>
- 		<p>&nbsp;</p>
- 		<p>&nbsp;</p>
  	</div>
  	<div id="bloc60">
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:51 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles home-go-button.gif,1.2,NONE
Message-ID: <E1CoO1n-0005rf-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images/styles
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images/styles

Removed Files:
      Tag: rel_2_2
	home-go-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- home-go-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:52 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:52 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/images book.gif,1.2,NONE circle.gif,1.2,NONE disk.gif,1.2,NONE dk-brown-dot.gif,1.2,NONE dvd.gif,1.2,NONE fine.gif,1.2,NONE front-arrow.gif,1.2,NONE front-background-med.gif,1.2,NONE heading-login-2.gif,1.2,NONE heading-login.gif,1.2,NONE heading-member.gif,1.2,NONE heading-search-2.gif,1.2,NONE heading-search-3.gif,1.2,NONE heading-search.gif,1.2,NONE hltlogo.gif,1.2,NONE holder.gif,1.2,NONE jigsaw.gif,1.2,NONE koha.gif,1.2,NONE large-print.gif,1.2,NONE magazine.gif,1.2,NONE map.gif,1.2,NONE picture-book.gif,1.2,NONE place-reserve.jpg,1.2,NONE search-button.gif,1.2,NONE selected-circle.gif,1.2,NONE sm-book.gif,1.2,NONE sm-disk.gif,1.2,NONE sm-dvd.gif,1.2,NONE sm-jigsaw.gif,1.2,NONE sm-lg-print.gif,1.2,NONE sm-picture-book.gif,1.2,NONE sm-tape.gif,1.2,NONE talking-book.gif,1.2,NONE tan-dot.gif,1.2,NONE tape.gif,1.2,NONE vanilla-logout-button.gif,1.2,NONE
Message-ID: <E1CoO1o-0005ro-8x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/images

Removed Files:
      Tag: rel_2_2
	book.gif circle.gif disk.gif dk-brown-dot.gif dvd.gif fine.gif 
	front-arrow.gif front-background-med.gif heading-login-2.gif 
	heading-login.gif heading-member.gif heading-search-2.gif 
	heading-search-3.gif heading-search.gif hltlogo.gif holder.gif 
	jigsaw.gif koha.gif large-print.gif magazine.gif map.gif 
	picture-book.gif place-reserve.jpg search-button.gif 
	selected-circle.gif sm-book.gif sm-disk.gif sm-dvd.gif 
	sm-jigsaw.gif sm-lg-print.gif sm-picture-book.gif sm-tape.gif 
	talking-book.gif tan-dot.gif tape.gif 
	vanilla-logout-button.gif 
Log Message:
removing vanilla templates, that are out of date

--- book.gif DELETED ---

--- circle.gif DELETED ---

--- disk.gif DELETED ---

--- dk-brown-dot.gif DELETED ---

--- dvd.gif DELETED ---

--- fine.gif DELETED ---

--- front-arrow.gif DELETED ---

--- front-background-med.gif DELETED ---

--- heading-login-2.gif DELETED ---

--- heading-login.gif DELETED ---

--- heading-member.gif DELETED ---

--- heading-search-2.gif DELETED ---

--- heading-search-3.gif DELETED ---

--- heading-search.gif DELETED ---

--- hltlogo.gif DELETED ---

--- holder.gif DELETED ---

--- jigsaw.gif DELETED ---

--- koha.gif DELETED ---

--- large-print.gif DELETED ---

--- magazine.gif DELETED ---

--- map.gif DELETED ---

--- picture-book.gif DELETED ---

--- place-reserve.jpg DELETED ---

--- search-button.gif DELETED ---

--- selected-circle.gif DELETED ---

--- sm-book.gif DELETED ---

--- sm-disk.gif DELETED ---

--- sm-dvd.gif DELETED ---

--- sm-jigsaw.gif DELETED ---

--- sm-lg-print.gif DELETED ---

--- sm-picture-book.gif DELETED ---

--- sm-tape.gif DELETED ---

--- talking-book.gif DELETED ---

--- tan-dot.gif DELETED ---

--- tape.gif DELETED ---

--- vanilla-logout-button.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/includes crumb-end.inc,1.1,NONE crumb-start.inc,1.1,NONE home-modern.css,1.1,NONE itemtype-image.inc,1.1,NONE koha.css,1.1,NONE main.css,1.1,NONE opac.css,1.1,NONE script.js,1.1,NONE vanilla-about-menu.inc,1.1,NONE vanilla-about-menu.tmpl,1.1,NONE vanilla-botnav-all.inc,1.1,NONE vanilla-cat-search.inc,1.1,NONE vanilla-contact-menu.tmpl,1.1,NONE vanilla-crumb-end.inc,1.1,NONE vanilla-crumb-start.inc,1.1,NONE vanilla-end-main.inc,1.1,NONE vanilla-key.inc,1.1,NONE vanilla-left-nav.inc,1.1,NONE vanilla-logout.inc,1.1,NONE vanilla-main.css,1.1,NONE vanilla-member-menu.inc,1.1,NONE vanilla-membership-botnav.inc,1.1,NONE vanilla-membership-left-nav.inc,1.1,NONE vanilla-menu.inc,1.1,NONE vanilla-personal-details.inc,1.1,NONE vanilla-search-menu.inc,1.1,NONE
Message-ID: <E1CoO2S-0005uS-QY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc home-modern.css 
	itemtype-image.inc koha.css main.css opac.css script.js 
	vanilla-about-menu.inc vanilla-about-menu.tmpl 
	vanilla-botnav-all.inc vanilla-cat-search.inc 
	vanilla-contact-menu.tmpl vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing unido templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- home-modern.css DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-about-menu.inc DELETED ---

--- vanilla-about-menu.tmpl DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-contact-menu.tmpl DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en/images unido-home-photos.jpg,1.1,NONE unido-logo.gif,1.1,NONE
Message-ID: <E1CoO2S-0005uJ-QP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en/images

Removed Files:
      Tag: rel_2_2
	unido-home-photos.jpg unido-logo.gif 
Log Message:
removing unido templates, that are out of date

--- unido-home-photos.jpg DELETED ---

--- unido-logo.gif DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:53 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en/includes crumb-end.inc,1.2,NONE crumb-start.inc,1.2,NONE itemtype-image.inc,1.2,NONE koha.css,1.2,NONE main.css,1.2,NONE opac.css,1.2,NONE script.js,1.2,NONE vanilla-botnav-all.inc,1.2,NONE vanilla-cat-search.inc,1.2,NONE vanilla-crumb-end.inc,1.2,NONE vanilla-crumb-start.inc,1.2,NONE vanilla-end-main.inc,1.2,NONE vanilla-key.inc,1.2,NONE vanilla-left-nav.inc,1.2,NONE vanilla-logout.inc,1.2,NONE vanilla-main.css,1.3,NONE vanilla-member-menu.inc,1.2,NONE vanilla-membership-botnav.inc,1.2,NONE vanilla-membership-left-nav.inc,1.3,NONE vanilla-menu.inc,1.2,NONE vanilla-personal-details.inc,1.2,NONE vanilla-search-menu.inc,1.2,NONE
Message-ID: <E1CoO1p-0005ru-Bb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en/includes

Removed Files:
      Tag: rel_2_2
	crumb-end.inc crumb-start.inc itemtype-image.inc koha.css 
	main.css opac.css script.js vanilla-botnav-all.inc 
	vanilla-cat-search.inc vanilla-crumb-end.inc 
	vanilla-crumb-start.inc vanilla-end-main.inc vanilla-key.inc 
	vanilla-left-nav.inc vanilla-logout.inc vanilla-main.css 
	vanilla-member-menu.inc vanilla-membership-botnav.inc 
	vanilla-membership-left-nav.inc vanilla-menu.inc 
	vanilla-personal-details.inc vanilla-search-menu.inc 
Log Message:
removing vanilla templates, that are out of date

--- crumb-end.inc DELETED ---

--- crumb-start.inc DELETED ---

--- itemtype-image.inc DELETED ---

--- koha.css DELETED ---

--- main.css DELETED ---

--- opac.css DELETED ---

--- script.js DELETED ---

--- vanilla-botnav-all.inc DELETED ---

--- vanilla-cat-search.inc DELETED ---

--- vanilla-crumb-end.inc DELETED ---

--- vanilla-crumb-start.inc DELETED ---

--- vanilla-end-main.inc DELETED ---

--- vanilla-key.inc DELETED ---

--- vanilla-left-nav.inc DELETED ---

--- vanilla-logout.inc DELETED ---

--- vanilla-main.css DELETED ---

--- vanilla-member-menu.inc DELETED ---

--- vanilla-membership-botnav.inc DELETED ---

--- vanilla-membership-left-nav.inc DELETED ---

--- vanilla-menu.inc DELETED ---

--- vanilla-personal-details.inc DELETED ---

--- vanilla-search-menu.inc DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:34:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:34:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/unido/en about.tmpl,1.2,NONE contact.tmpl,1.1,NONE opac-detail-all.tmpl,1.2,NONE opac-detail-multi.tmpl,1.1,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.6,NONE opac-search.tmpl,1.3,NONE
Message-ID: <E1CoO2S-0005uV-V4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/unido/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22693/koha-tmpl/opac-tmpl/unido/en

Removed Files:
      Tag: rel_2_2
	about.tmpl contact.tmpl opac-detail-all.tmpl 
	opac-detail-multi.tmpl opac-detail.tmpl opac-main.tmpl 
	opac-search.tmpl 
Log Message:
removing unido templates, that are out of date

--- about.tmpl DELETED ---

--- contact.tmpl DELETED ---

--- opac-detail-all.tmpl DELETED ---

--- opac-detail-multi.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-search.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:33:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:33:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/vanilla/en loggedin.tmpl,1.2,NONE opac-account.tmpl,1.2,NONE opac-auth.tmpl,1.2,NONE opac-detail.tmpl,1.2,NONE opac-main.tmpl,1.3,NONE opac-membership.tmpl,1.2,NONE opac-readingrecord.tmpl,1.2,NONE opac-reserve.tmpl,1.2,NONE opac-searchresults.tmpl,1.3,NONE opac-search.tmpl,1.2,NONE opac-userdetails.tmpl,1.2,NONE opac-user.tmpl,1.3,NONE opac-userupdate.tmpl,1.2,NONE
Message-ID: <E1CoO1q-0005ry-At@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/vanilla/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22529/koha-tmpl/opac-tmpl/vanilla/en

Removed Files:
      Tag: rel_2_2
	loggedin.tmpl opac-account.tmpl opac-auth.tmpl 
	opac-detail.tmpl opac-main.tmpl opac-membership.tmpl 
	opac-readingrecord.tmpl opac-reserve.tmpl 
	opac-searchresults.tmpl opac-search.tmpl opac-userdetails.tmpl 
	opac-user.tmpl opac-userupdate.tmpl 
Log Message:
removing vanilla templates, that are out of date

--- loggedin.tmpl DELETED ---

--- opac-account.tmpl DELETED ---

--- opac-auth.tmpl DELETED ---

--- opac-detail.tmpl DELETED ---

--- opac-main.tmpl DELETED ---

--- opac-membership.tmpl DELETED ---

--- opac-readingrecord.tmpl DELETED ---

--- opac-reserve.tmpl DELETED ---

--- opac-searchresults.tmpl DELETED ---

--- opac-search.tmpl DELETED ---

--- opac-userdetails.tmpl DELETED ---

--- opac-user.tmpl DELETED ---

--- opac-userupdate.tmpl DELETED ---




From tipaul at users.sourceforge.net  Tue Jan 11 16:35:30 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:35:30 -0800
Subject: [Koha-cvs] CVS: koha about.pl,1.4,1.4.4.1
Message-ID: <E1CoO3O-0005ym-1P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22968

Modified Files:
      Tag: rel_2_2
	about.pl 
Log Message:
correct detection of apache2 on mandrakelinux

Index: about.pl
===================================================================
RCS file: /cvsroot/koha/koha/about.pl,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** about.pl	28 Nov 2003 13:59:30 -0000	1.4
--- about.pl	11 Jan 2005 15:35:26 -0000	1.4.4.1
***************
*** 25,28 ****
--- 25,29 ----
  my $mysqlVersion = `mysql -V`;
  my $apacheVersion =  `httpd -v`;
+ $apacheVersion =  `httpd2 -v` unless $apacheVersion;
  
  $template->param(




From tipaul at users.sourceforge.net  Tue Jan 11 16:36:10 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 07:36:10 -0800
Subject: [Koha-cvs] CVS: koha bull-home.pl,1.2,1.2.2.1
Message-ID: <E1CoO42-00061v-0H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23155

Modified Files:
      Tag: rel_2_2
	bull-home.pl 
Log Message:
modifs to handdle correctly more than 1 subscription of the same biblio. Enter subscription detail in subscription notes (like "for branch XX" or "for 2nd floor"). The subscription details are all shown in OPAC.

you can now delete a subscription that is not yet active (= has only 1 issue in "waiting" state)



Index: bull-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull-home.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** bull-home.pl	5 Aug 2004 16:37:07 -0000	1.2
--- bull-home.pl	11 Jan 2005 15:36:02 -0000	1.2.2.1
***************
*** 13,17 ****
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my @subscriptions = getsubscriptions($title,$ISSN);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",
--- 13,18 ----
  my $title = $query->param('title');
  my $ISSN = $query->param('ISSN');
! my $biblionumber = $query->param('biblionumber');
! my @subscriptions = getsubscriptions($title,$ISSN,$biblionumber);
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "bull/bull-home.tmpl",




From tipaul at users.sourceforge.net  Tue Jan 11 17:03:00 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:03:00 -0800
Subject: [Koha-cvs] CVS: koha/C4 Biblio.pm,1.115.2.1,1.115.2.2
Message-ID: <E1CoOU0-0007el-HA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29334/C4

Modified Files:
      Tag: rel_2_2
	Biblio.pm 
Log Message:
in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.

Index: Biblio.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Biblio.pm,v
retrieving revision 1.115.2.1
retrieving revision 1.115.2.2
diff -C2 -r1.115.2.1 -r1.115.2.2
*** Biblio.pm	11 Jan 2005 14:45:37 -0000	1.115.2.1
--- Biblio.pm	11 Jan 2005 16:02:35 -0000	1.115.2.2
***************
*** 1806,1814 ****
          $item->{'location'},	   $item->{'itemnum'}
      );
-     if ( $item->{'barcode'} eq '' ) {
-         $item->{'notforloan'} = 0 unless $item->{'notforloan'};
-         $query = "update items set notforloan=? where itemnumber=?";
-         @bind = ( $item->{'notforloan'}, $item->{'itemnum'} );
-     }
      if ( $item->{'lost'} ne '' ) {
          $query = "update items set biblioitemnumber=?,
--- 1806,1809 ----
***************
*** 2632,2635 ****
--- 2627,2633 ----
  # $Id$
  # $Log$
+ # Revision 1.115.2.2  2005/01/11 16:02:35  tipaul
+ # in catalogue, modifs were not stored properly the non-MARC item DB. Affect only libraries without barcodes.
+ #
  # Revision 1.115.2.1  2005/01/11 14:45:37  tipaul
  # bugfix : issn were not stored correctly in non-MARC DB on biblio modification




From tipaul at users.sourceforge.net  Tue Jan 11 17:10:13 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:10:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-search.tmpl,1.11.2.1,1.11.2.2
Message-ID: <E1CoOaz-00082r-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30879/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-search.tmpl 
Log Message:
1st fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=853

When I search by barcode from this page:
/cgi-bin/koha/search.marc/search.pl?type=intranet
A search for an existing barcode returns no results.  A search by call number
also returns no results.

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -r1.11.2.1 -r1.11.2.2
*** opac-search.tmpl	11 Jan 2005 15:32:37 -0000	1.11.2.1
--- opac-search.tmpl	11 Jan 2005 16:10:10 -0000	1.11.2.2
***************
*** 76,80 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>
--- 76,80 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" name="value" onchange="sql_update()" /> 
  		</p>




From tipaul at users.sourceforge.net  Tue Jan 11 17:34:03 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 08:34:03 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.3.2.1
Message-ID: <E1CoOy3-00013w-2y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4030/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
The OPAC requires uses to log in to view virtual shelves, and it requires a user
with librarian privileges.  Virtual shelves should be viewable by all users,
logged in or not, and editable by all logged-in users in good standing.

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
***************
*** 43,47 ****
  							query => $query,
  							type => "opac",
! 							authnotrequired => 0,
  						});
  
--- 43,47 ----
  							query => $query,
  							type => "opac",
! 							authnotrequired => 1,
  						});
  
***************
*** 188,191 ****
--- 188,197 ----
  #
  # $Log$
+ # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
+ # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
+ # The OPAC requires uses to log in to view virtual shelves, and it requires a user
+ # with librarian privileges.  Virtual shelves should be viewable by all users,
+ # logged in or not, and editable by all logged-in users in good standing.
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Tue Jan 11 17:44:12 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:44:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1 shelves.tmpl,NONE,1.1
Message-ID: <E1CoP7s-0001fg-Pr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6402/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:46:29 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:46:29 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,NONE,1.1.2.1 shelves.tmpl,NONE,1.1.2.1
Message-ID: <E1CoPA5-0001mS-Tr@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6832/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Added Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl shelves.tmpl 
Log Message:
Adding NPL versions of these templates

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="main-top.inc" -->
<div id="main-compact">
<form>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
	<table>
		<caption>Select a Bookshelf</caption>
		<tr><td><label>Title</label></td><td><!-- TMPL_VAR NAME="title" --></td></tr>
		<tr><td><label>Author</label></td><td><!-- TMPL_VAR NAME="author" --></td></tr>
		<tr><td><label>Add to virtual shelf</label></td><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
		<tr><th colspan="2">...or add to a new bookshelf:</th></tr>
		<tr><td><label for="newbookshelf">Shelf Name:</label> </td><td><input type="text" name="newbookshelf" id="newbookshelf" maxlength="40" size="20" /></td></tr>
		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select></td></tr>
	</table>
	<input type="submit" value="Add to virtual shelf" class="submit" />
</form>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Virtual Shelves<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF Name="viewshelf" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<table>
			<caption><!-- TMPL_VAR NAME="shelfname" --></caption>
				<tr>
					<th>&nbsp;</th>
					<th>Title</th>
					<th>Author</th>
					<th>Barcode</th>
				</tr>
				<!-- TMPL_LOOP Name="itemsloop" -->
					<tr>
						<td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->" /></td>
						<td><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
						<td><!-- TMPL_VAR NAME="author" --></td> 
						<td><!-- TMPL_VAR NAME="barcode" --></td>
					</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<!-- TMPL_IF name="manageshelf" -->
				<input type="submit" value="Remove Selected Items" class="submit" />
			<!-- /TMPL_IF --></form><br>

	<!-- TMPL_IF name="manageshelf" -->
		<form>
		<table>
		<caption>Add a book by barcode</caption>
		<tr><td><label for="barcode">Barcode:</label></td><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
			<input type="text" size="14" maxlength="14" id="barcode" name="addbarcode" />
			<input type="hidden" name="modifyshelfcontents" value="1" />
			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="submit" value="Save" class="submit" /></td></tr></table>
		</form>
	<!-- /TMPL_IF -->
		<form action="/cgi-bin/koha/bookshelves/shelves.pl" method="get"><input type="submit" class="submit" value="Return to Virtual Shelves" /></form>
				</div>
<!-- TMPL_ELSE -->
	<!-- TMPL_IF Name="shelves" -->
		<h1>Bookshelves</h1>
		<!-- TMPL_IF Name="status1" -->
			<p class="problem"><!-- TMPL_VAR NAME="string1" --><p>
		<!-- /TMPL_IF -->
		<!-- TMPL_LOOP Name="paramsloop" -->
			<!-- TMPL_IF Name="status" -->
				<p class="problem"><!-- TMPL_VAR NAME="string" --><p>
			<!-- /TMPL_IF -->
		<!-- /TMPL_LOOP -->
		<div id="bloc25">
					<h2>Select Shelves to Delete</h2>
					<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
					<input type="hidden" name="shelves" value="1" />
						<!-- TMPL_LOOP Name="shelvesloop" -->
						<!-- TMPL_IF name="canmanage" -->
						<p>
							<label></label>
								<input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" />
							
								<a href="shelves.pl?viewshelf=<!-- TMPL_VAR name="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a> (<!-- TMPL_VAR NAME="shelfbookcount" --> item(s))
						</p>
						<!-- /TMPL_IF -->
						<!-- /TMPL_LOOP -->
					<p>
						<input type="submit" value="Delete Shelves" class="submit" />
					</p>
					</form>
		</div>
		<div id="bloc25">
			<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
				<input type="hidden" name="shelves" value="1" />
				<h2>Add Shelf</h2>
				<p><label>Name</label><input type="text" name="addshelf" size="25" /></p>
				<p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></p>
				<p><label>Category</label>
					<select name="category">
						<option value="1">Private</option>
						<option value="2">Public</option>
						<option value="3">Free</option>
					</select>
				</p>
				<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
					<li> A public can be seen by everybody, but managed only by you.</li>
					<li> A free can be managed by any user.</li>
				</p>
				<p>
					<input type="submit" value="Add New Shelf" class="submit" />
					<a href="shelves.pl">back to shelf list</a>
				</p>

			</form>
		</div>
	<!-- TMPL_ELSE -->
			<table>
			<caption>Virtual Shelves</caption>
				<tr>
					<th>Shelf Name</th>
					<th>Category</th>
					<th>Content size</th>
					<th>&nbsp;</th>
				</tr>
				<!-- TMPL_LOOP Name="shelvesloop" -->
				<tr>
					<td>
						<a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
							<!-- TMPL_VAR NAME="shelfname" -->
						</a>
					</td>
					<td>
						<!-- TMPL_IF NAME="category1" -->
							Private
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category2" -->
							Public
						<!-- /TMPL_IF -->
						<!-- TMPL_IF NAME="category3" -->
							Free
						<!-- /TMPL_IF -->
					</td>
					<td>
						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
					</td>
					<!-- TMPL_IF name="mine" -->
						<td>
							<a href="shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Edit</a>
							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->						</td>
					<!-- /TMPL_IF -->
				</tr>
				<!-- /TMPL_LOOP -->
			</table>
			<form action="shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" class="submit" value="Add or Remove Book Shelves" />
	<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

<!-- TMPL_IF name="edit" -->
		<form method="post" action="<!-- TMPL_VAR NAME="script_name" -->">
			<input type="hidden" name="op" value="modifsave" />
			<table>
			<caption>Editing Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
			<tr><td><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->" /><label for="shelfname">Name:</label></td><td><input id="shelfname" type="text" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
			<tr><td><label for="owner">Owner:</label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->" /><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
			<tr><td><label for="category">Category:</label></td><td><select id="category" name="category">
					<!-- TMPL_IF name="category1" -->
						<option value="1" selected>Private</option>
					<!-- TMPL_ELSE -->
						<option value="1">Private</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category2" -->
						<option value="2" selected>Public</option>
					<!-- TMPL_ELSE -->
						<option value="2">Public</option>
					<!-- /TMPL_IF -->
					<!-- TMPL_IF name="category3" -->
						<option value="3" selected>Free</option>
					<!-- TMPL_ELSE -->
						<option value="3">Free</option>
					<!-- /TMPL_IF -->
				</select></td></tr>
			</table>
			<ul><li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
				<li> A public can be seen by everybody, but managed only by you.</li>
				<li> A free can be managed by any user.</li></ul>
			<p><input type="submit" value="Save Changes" class="submit" /></p>
		</form>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 11 17:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.1.2.1,1.1.2.2 result.tmpl,1.1.2.1,1.1.2.2 subscription-detail.tmpl,1.2,1.2.2.1
Message-ID: <E1CoPH4-000264-0r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8042/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** bull-home.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- bull-home.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** result.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:53:39 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From oleonard at users.sourceforge.net  Tue Jan 11 17:54:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 08:54:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull bull-home.tmpl,1.2,1.3 result.tmpl,1.2,1.3 subscription-detail.tmpl,1.2,1.3
Message-ID: <E1CoPHe-00028q-Jb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8212/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	bull-home.tmpl result.tmpl subscription-detail.tmpl 
Log Message:
Synching with latest changes to default template

Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/bull-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** bull-home.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- bull-home.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 28,32 ****
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" -->
  				</td>
  				<td>
--- 28,32 ----
  			<tr>
  				<td>
! 					<!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
  				</td>
  				<td>

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** result.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 40,44 ****
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->
--- 40,44 ----
  					</p>
  				</td>
! 				<td><form action="#" method="post"><input type="submit" class="submit" value="Choose" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" ESCAPE="url" -->'); return false;" /></form></td>
  			</tr>
  			<!-- /TMPL_LOOP -->

Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.tmpl	2 Nov 2004 21:38:41 -0000	1.2
--- subscription-detail.tmpl	11 Jan 2005 16:54:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-circ-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Subscription Details for <!-- TMPL_VAR name="bibliotitle" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="serials-topmenu.inc" -->
***************
*** 6,10 ****
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form>
  
  <div class="data">
--- 6,10 ----
  <div id="main">
  <h1>Subscription: <!-- TMPL_VAR name="bibliotitle" --></h1>
! <form class="inline" action="subscription-add.pl" method="get"><input type="hidden" name="op" value="mod" /><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="Edit Subscription" /></form> <form class="inline" action="statecollection.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="submit" class="submit" value="View Issues" /></form> <form class="inline" action="/cgi-bin/koha/MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="submit" value="View Bibliographic Record" /></form><!-- TMPL_UNLESS name="totalissues" --><form class="inline" action="subscription-detail.pl" method="get"><input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR name="subscriptionid" -->" /><input type="hidden" name="op" value="del" /><input type="submit" class="cancel" value="Delete subscription" /></form><!-- /TMPL_UNLESS -->
  
  <div class="data">




From tipaul at users.sourceforge.net  Tue Jan 11 18:41:54 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 09:41:54 -0800
Subject: [Koha-cvs] CVS: koha/value_builder unimarc_field_225a.pl,1.8,1.8.2.1
Message-ID: <E1CoQ1i-0004oF-Ck@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18435/value_builder

Modified Files:
      Tag: rel_2_2
	unimarc_field_225a.pl 
Log Message:
fix to show seriestitle even for books without isbn (but with a editor, of course)

Index: unimarc_field_225a.pl
===================================================================
RCS file: /cvsroot/koha/koha/value_builder/unimarc_field_225a.pl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** unimarc_field_225a.pl	23 Sep 2004 16:33:13 -0000	1.8
--- unimarc_field_225a.pl	11 Jan 2005 17:41:44 -0000	1.8.2.1
***************
*** 119,123 ****
  	# if there is an isbn, complete search
  		my @collections;
- 	if ($isbn_found) {
  		my $sth = $dbh->prepare("select auth_subfield_table.authid,subfieldvalue from auth_subfield_table 
  						left join auth_header on auth_subfield_table.authid=auth_header.authid 
--- 119,122 ----
***************
*** 135,146 ****
  			}
  		}
- 	} else {
- 	# if there is no isbn, search with %
- 		my $sth = $dbh->prepare("select stdlib from bibliothesaurus where father like ? and category='EDITORS' order by stdlib");
- 		$sth->execute("\%$authoritysep $editor_found $authoritysep");
- 		while (my ($line)= $sth->fetchrow) {
- 			push @collections,$line;
- 		}
- 	}
  #	my @collections = ["test"];
  	my $collection =CGI::scrolling_list(-name=>'f1',
--- 134,137 ----




From tipaul at users.sourceforge.net  Tue Jan 11 19:33:46 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:33:46 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes popup-bottom.inc,NONE,1.1.2.1 popup-top.inc,NONE,1.1.2.1
Message-ID: <E1CoQpu-0007ZH-N0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29081/koha-tmpl/opac-tmpl/css/en/includes

Added Files:
      Tag: rel_2_2
	popup-bottom.inc popup-top.inc 
Log Message:
missing files

--- NEW FILE ---
</body>
</html>

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
	<title>popup</title>
	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
	<!-- TMPL_IF name="opacstylesheet" -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="opacstylesheet"-->" />
	<!-- TMPL_ELSE -->
		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
	<!-- /TMPL_IF -->
</head>

<body>
<!-- NO MENUS for popup-top -->




From tipaul at users.sourceforge.net  Tue Jan 11 19:34:55 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Tue, 11 Jan 2005 10:34:55 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes basket.js,1.3,1.3.2.1
Message-ID: <E1CoQr1-0007dd-J3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29346/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
in biblio basket, adding the possibility to open a biblio (in the main window) by clicking on the title

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/basket.js,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** basket.js	8 Dec 2004 10:27:10 -0000	1.3
--- basket.js	11 Jan 2005 18:34:52 -0000	1.3.2.1
***************
*** 358,360 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 21:18:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 12:18:33 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.1,1.3.2.2
Message-ID: <E1CoSTJ-0005kR-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22081/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-shelves.pl	11 Jan 2005 16:33:57 -0000	1.3.2.1
--- opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};		
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
  # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :




From oleonard at users.sourceforge.net  Tue Jan 11 23:47:27 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:47:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.1.2.1
Message-ID: <E1CoUnP-0005gE-AI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21793/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding checkall() and confirmdelete() functions for use in virtual shelves

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
***************
*** 39,40 ****
--- 39,62 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 11 23:48:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:48:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images checkall.gif,NONE,1.1.2.1
Message-ID: <E1CoUoZ-0005lw-JJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22157/koha-tmpl/opac-tmpl/npl/en/images

Added Files:
      Tag: rel_2_2
	checkall.gif 
Log Message:
Adding checkall graphic for use in results lists

--- NEW FILE ---
GIF89a



From oleonard at users.sourceforge.net  Tue Jan 11 23:49:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 11 Jan 2005 14:49:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1,1.1.2.1
Message-ID: <E1CoUpq-0005zk-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23003/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Many changes to appearance and functionality of virtual shelves

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-shelves.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
***************
*** 5,163 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form>
      <table>
      		<tr>
! 			<th colspan="4">
! 				Contents of <!-- TMPL_VAR Name="shelfname" -->
! 			</th>
  		</tr>
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted"><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="title" --></td>
! 					<td class="hilighted"><!-- TMPL_VAR Name="author" --></td>
! 				<!-- TMPL_ELSE -->
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
! 					<td class="hilighted"><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="barcode" --></a></td>
! 					<td><!-- TMPL_VAR Name="title" --></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 				<!-- /TMPL_IF -->
! 			</tr>
! 		<!-- /TMPL_LOOP -->
  	</table>
! 	<br>
! 	<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<!-- TMPL_IF name="manageshelf" -->
! 		<input type="submit" value="Remove Selected Items" class="submit">
! 	<!-- /TMPL_IF -->
! </form>
! <!-- TMPL_IF name="manageshelf" -->
! <form>
! 	<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 	<input type="hidden" name="modifyshelfcontents" value="1">
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->">
  	<table>
  		<tr>
! 			<td>
! 				Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
! 			</td>
! 			<td>
! 				<input name="addbarcode">
! 				<input type="hidden" name="modifyshelfcontents" value="1">
! 				<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
! 				<input type="submit" value="Save" class="submit">
! 			</td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<font color="red"><!-- TMPL_VAR Name="string1" --></font><p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<font color="red"><!-- TMPL_VAR Name="string" --></font><p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		
! 		<h1>Bookshelves</h1>
! 		<table border="0" cellpadding="7">
! 			<tr>
! 				<td align="center" valign="bottom">
! 					<form>
! 						<p>
! 							<a href="opac-shelves.pl" class="submit">Shelf list</a>
! 						</p>
  					</form>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value=1>
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>Select Shelves to Delete
! 							</th>
! 						</tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td bgcolor="<!-- TMPL_VAR Name="color" -->">
! 								<input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->">
! 								<!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 							</td>
! 						</tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 					<p>
! 						<input type="submit" value="Delete Shelves" class="submit"></form>
! 					</p>
! 				</td>
! 				<td align="center" valign="bottom">
! 					<form method="post">
! 					<input type="hidden" name="shelves" value="1">
! 					<table border="0" cellpadding="0" cellspacing="0">
! 						<tr>
! 							<th>
! 								<font color="white">Add Shelf</font>
! 							</th>
! 						</tr>
! 						<tr>
! 							<td>
! 								<p>Name : <input type="text" name="addshelf" size="25"></p>
! 								<p>Owner : <input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
! 								<p>Category : <select name="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select>
! 								</p>
! 								<p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
! 									<li> A public can be seen by everybody, but managed only by you.</li>
! 									<li> A free can be managed by any user.</li>
! 								</p>
! 							</td>
! 						</tr>
! 					</table>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
! 
  	<!-- TMPL_ELSE -->
! 		
! 		<table>
! 			<tr>
! 				<th>
! 				Shelf List
! 				</th>
! 			</tr>
! 			<!-- TMPL_LOOP Name="shelvesloop" -->
! 			<tr>
! 				<!-- TMPL_IF name="color" -->
! 					<td class="hilighted">
! 				<!-- TMPL_ELSE -->
! 					<td>
! 				<!-- /TMPL_IF -->
! 					<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
! 						<!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
! 					</a>
! 				</td>
! 			</tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<P>
! 			<a href="opac-shelves.pl?shelves=1" class="submit">Add or Remove Book Shelves</a>
! 		</p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
  </div>
  </body>
--- 5,133 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
+ 	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
      		<tr>
! 			<th><a href="/cgi-bin/koha/opac-shelves.pl" onclick="CheckAll(); return false;"><img src="<!-- TMPL_VAR NAME="themelang" -->/images/checkall.gif" height="18" width="18" alt="Check All" title="Check All" border="0" /></a></th><th>&nbsp;</th><th>Title</th><th>Author</th><th>Call No.</th><th>Barcode</th><!-- TMPL_UNLESS NAME="itemsloop" --><th>&nbsp;</th><!-- /TMPL_UNLESS -->
  		</tr>
+ 		<!-- TMPL_IF NAME="itemsloop" -->
  		<!-- TMPL_LOOP Name="itemsloop" -->
! 			<tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
! 					<td><input type="checkbox" name="REM-<!-- TMPL_VAR Name="itemnumber" -->" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" />
! 	<input type="hidden" name="modifyshelfcontents" value="1" />
! 	<input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /></td>
! 					<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
! 					<td><a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR Name="title" --></a></td>
  					<td><!-- TMPL_VAR Name="author" --></td>
! 					<td><!-- TMPL_VAR NAME="classification" --></td>
! 					<td><!-- TMPL_VAR Name="barcode" --></td>
! 		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
! 		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
! <br /><br />
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
  	<table>
+ 		<tr><th colspan="2">Add an Item to this Shelf by Barcode</th></tr>
  		<tr>
! 			<td><label for="addbarcode">Barcode:</label></td>
! 			<td><input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" /><input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="viewshelf" value="<!-- TMPL_VAR Name="shelfnumber" -->" /><input type="hidden" name="modifyshelfcontents" value="1" /><input type="submit" value="Save" class="submit" /></td>
  		</tr>
  	</table>
  </form>
  <!-- /TMPL_IF -->
+ <form class="inline" method="get" action="opac-shelves.pl"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form>
  <!-- TMPL_ELSE -->
  	<!-- TMPL_IF Name="shelves" -->
  		<!-- TMPL_IF Name="status1" -->
! 			<p class="error"><!-- TMPL_VAR Name="string1" --></p>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_LOOP Name="paramsloop" -->
  			<!-- TMPL_IF Name="status" -->
! 				<p class="error"><!-- TMPL_VAR Name="string" --></p>
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! <div id="center">
! <form method="post" action="/cgi-bin/koha/opac-shelves.pl">
! 		<input type="hidden" name="shelves" value="1">
! 		<table>
! 		<caption>Create a New a Virtual Shelf</caption>
! 		<tr><td><label for="addshelf">Shelf Name:</label> </td><td> <input id="addshelf" type="text" name="addshelf" size="25"></td></tr>
! 		<tr><td><label for="owner">Owner:</label> </td><td><input type="hidden" name="owner" id="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></td></tr>
! 		<tr><td><label for="category">Category:</label> </td><td><select name="category" id="category">
! 									<option value="1">Private</option>
! 									<option value="2">Public</option>
! 									<option value="3">Free</option>
! 									</select></td></tr></table>
! 		<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen only by you.</li><li> A <strong>public</strong> virtual shelf can be seen by everybody, but managed only by you.</li>
! 			<li> A <strong>free</strong> virtual shelf can be added to and changed by any user.</li></ul>
! 								<p><input type="submit" value="Add New Shelf" class="submit"></p>
  					</form>
! 				</div>		
! 		
! 		<div id="right"><!-- TMPL_IF NAME="shelvesloop" -->
! 		<form method="post" action="/cgi-bin/koha/opac-shelves.pl" name="mainform">
! 					<input type="hidden" name="shelves" value="1" />
! 					<table>
! 					<caption>Delete Virtual Shelves</caption>
! 						<tr><th>&nbsp;</th><th>Shelf Name</th><th>Contents</th></tr>
  						<!-- TMPL_LOOP Name="shelvesloop" -->
  						<!-- TMPL_IF name="canmanage" -->
  						<tr>
! 							<td><input type="checkbox" name="DEL-<!-- TMPL_VAR Name="shelf" -->" /></td><td><a href="/cgi-bin/koha/opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td></tr>
  						<!-- /TMPL_IF -->
  						<!-- /TMPL_LOOP -->
  					</table>
! 		<input type="submit" value="Delete Shelves" class="submit" /></form>
! 		<!-- /TMPL_IF -->
! 		<p><form class="inline" action="opac-shelves.pl" method="get"><input type="submit" class="submit" value="Back to Virtual Shelves" /></form></p>
! </div>
  	<!-- TMPL_ELSE -->
! 	<!-- TMPL_IF name="edit" -->
! 		<form method="post">
! 			<input type="hidden" name="op" value="modifsave">
! 			<input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR name="shelfnumber" -->">
! 			<table>
! 			<caption>Modify Virtual Shelf <em><!-- TMPL_VAR name="shelfname"--></em></caption>
! 			<tr><td><label for="shelfname">Shelf Name: </label></td><td><input type="text" id="shelfname" name="shelfname" size="25" value="<!-- TMPL_VAR name="shelfname"-->" /></td></tr>
! 			<tr><td><label for="owner">Owner: </label></td><td><input type="hidden" id="owner" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></td></tr>
! 			<tr><td><label for="category">Category: </label></td><td><select id="category" name="category">
! 					<!-- TMPL_IF name="category1" -->
! 						<option value="1" selected>Private</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="1">Private</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category2" -->
! 						<option value="2" selected>Public</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="2">Public</option>
! 					<!-- /TMPL_IF -->
! 					<!-- TMPL_IF name="category3" -->
! 						<option value="3" selected>Free</option>
! 					<!-- TMPL_ELSE -->
! 						<option value="3">Free</option>
! 					<!-- /TMPL_IF -->
! 				</select></td></tr>
! 			</table>
! 			<ul><li>A <strong>private</strong> virtual shelf is managed by you and can be seen <strong>only</strong> by you.</li>
! 				<li> A <strong>public</strong> virtual shelf can be seen by <strong>everybody</strong>, but managed only by you.</li>
! 				<li>A <strong>free</strong> virtual shelf can be added to or changed by <strong>any</strong> user.</li></ul>
! 			<p><input type="submit" value="Save Changes" class="submit"></p>
! 
! 		</form>
! <!-- /TMPL_IF -->
! <table>
! <caption>Virtual Shelves</caption>
! <tr><th>Shelf Name</th><th>Category</th><th>Content Size</th><th>&nbsp;</th></tr>
! <!-- TMPL_LOOP Name="shelvesloop" -->
! <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->><td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->"><!-- TMPL_VAR Name="shelfname" --></a></td><td><!-- TMPL_IF NAME="category1" -->Private<!-- /TMPL_IF --><!-- TMPL_IF NAME="category2" -->Public<!-- /TMPL_IF --><!-- TMPL_IF NAME="category3" -->Free<!-- /TMPL_IF --></td><td><!-- TMPL_VAR Name="shelfbookcount" --> item(s)</td><td><!-- TMPL_IF name="mine" --><a href="opac-shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelf" -->">Modify</a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td></tr>
  			<!-- /TMPL_LOOP -->
  		</table>
! 		<p><form action="opac-shelves.pl" method="get"><input type="hidden" value="1" name="shelves" /><input type="submit" value="Add or Remove Book Shelves" class="submit" /></form></p>
  	<!-- /TMPL_IF -->
  <!-- /TMPL_IF -->
+ 
+ <br clear="both" />
  </div>
  </body>




From oleonard at users.sourceforge.net  Wed Jan 12 18:00:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:00:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.30.2.1
Message-ID: <E1Colrd-0001wb-0I@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7436/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
      Tag: rel_2_2
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -C2 -r1.30 -r1.30.2.1
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:00:52 -0000	1.30.2.1
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:02:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:02:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/catalogue MARCdetail.tmpl,1.30,1.31
Message-ID: <E1Colt1-00022g-2Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7838/koha-tmpl/intranet-tmpl/default/en/catalogue

Modified Files:
	MARCdetail.tmpl 
Log Message:
Correcting malformed template tag delimiter

Index: MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** MARCdetail.tmpl	3 Jan 2005 10:48:37 -0000	1.30
--- MARCdetail.tmpl	12 Jan 2005 17:02:20 -0000	1.31
***************
*** 86,90 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 86,90 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 116,120 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 116,120 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 146,150 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 146,150 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 176,180 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 176,180 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 206,210 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 206,210 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 236,240 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 236,240 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 266,270 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 266,270 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 296,300 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 296,300 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 326,330 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 326,330 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
***************
*** 356,360 ****
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link">
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->
--- 356,360 ----
  				<p>
  					<label class="labelsubfield">
! 					<!-- TMPL_IF name="link" -->
  						<a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="link" -->&amp;operator==&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
  					<!-- TMPL_ELSE -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:46:56 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:46:56 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.2.2.1
Message-ID: <E1Coma8-0004ko-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18191/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:46:40 -0000	1.2.2.1
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 18:47:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 09:47:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters admin-home.tmpl,1.2,1.3
Message-ID: <E1Comav-0004oI-Ml@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18460/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	admin-home.tmpl 
Log Message:
Updating for 2.2

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/admin-home.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** admin-home.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- admin-home.tmpl	12 Jan 2005 17:47:30 -0000	1.3
***************
*** 5,87 ****
  <div id="main">
  <h1>Koha Administration</h1>
! 
! <h3>Parameters</h3>
! <div class="menu"><table>
! <caption>Biblio related</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>the supports of an item.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Currencies of booksellers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbudget.pl">Budget</a></th>
! 	<td>The monies allocated to your book funds.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book Funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised Values</a></th>
! 	<td>Define here categories and authorised values for them.
! 			Authorised values are used in MARC form to limit/help editing MARC biblios</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/thesaurus.pl">Thesaurus</a></th>
! 	<td>Thesaurus management. You can define as many thesaurus as needed, through definiitions of thesaurus "category"</td>
  </tr>
- </table></div>
- <div class="menu"><table>
- <caption>MARC related</caption>
- <tr><th><a href="/cgi-bin/koha/admin/marctagstructure.pl">MARC tag structure</a></th><td>MARC structure : tag then subfields</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links koha - MARC DB</a></th><td>Define links between the koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage</td></tr>
- <tr><th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th><td>Checks the MARC structure. USE IT before working with real data. It will warn you of mistakes that would BREAK the Koha database!</td></tr>
- </table></div>
- <div class="menu"><table>
- <caption>Various parameters</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library Branches</a></th>
! 	<td>the differents branches you manage with this Koha server</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Patron Categories</a></th>
! 	<td>the differents types of patrons.</td>
  </tr>
- <tr><th><a href="/cgi-bin/koha/admin/charges.pl">Fines</a></th><td>Overdue fine amounts for item type-patron type combinations.</td></tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop Words</a></th>
! 	<td>Words deleted during searches</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
! 	<td>Servers to query for MARC data</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></th>
! 	<td>System preferences</td>
  </tr>
- </table></div>
- <h3>Tools</h3>
- <div class="menu"><table>
- <caption>Import/Export</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
! 	<td>Exporting in MARC format</td>
  </tr>
  	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records</a> in Breeding Farm</th>
! 		<td>The breeding farm is a table where imported MARC records are stored.<br/>
! 			A MARC record is stored in the breeding farm as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the breeding farm.
! 			If it is found, the biblio is added to Koha active table and removed from the breeding farm. <br/>
  		</td>
  	</tr>
! </table></div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 5,108 ----
  <div id="main">
  <h1>Koha Administration</h1>
! <div class="menu">
! <table>
! <caption>System Preferences</caption>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
! 	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
  </tr>
+ </table>
+ <table>
+ <caption>System parameters </caption>
  <tr>
! <th class="header" colspan="2">For best results, configure these parameters in the order they appear</th>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
! 	<td>The different branches you manage with this Koha server.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
  	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
! 	<td>Define exchange rates.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
! 	<td>Define item types.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
! 	<td>Define the categories of borrowers.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
! 	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
! 	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
! 	<td>Define categories and thesaurus/authority MARC structure.</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
! 	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
! 	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
! 	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
! 
! <tr>
! <th colspan="2" class="header">Various parameters</th>
! </tr>
! <tr>
! 	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
! 	<td>Printers (UNIX paths).</td>
  </tr>
  <tr>
! 	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
! 	<td>Words deleted during searches.</td>
  </tr>
+ <tr>
+ 	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+ 	<td>Servers to query for MARC data.</td>
+ </tr>
+ </table>
+ 
+ <table>
+ 	<caption>Tools</caption>
+ 	<tr>
+ 	<th colspan="2" class="header">Export</th>
+ 	</tr>
+ 	<tr>
+ 		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+ 		<td> Exporting in MARC format.</td>
+ 	</tr>
  	<tr>
! 	<th colspan="2" class="header">Import</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
! 		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
  		</td>
  	</tr>
! 	<th colspan="2" class="header">Barcode generator</th>
! 	</tr>
! 	<tr>
! 		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
! 		<td>the barcode generator deals with generating barcodes for items you acquire
! 		</td>
! 	</tr>
! </table>
! </div>
  </div>
  <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:18:14 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:18:14 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.6.2.1
Message-ID: <E1CoowY-0004tW-H1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18742/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:19:05 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:19:05 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6,1.7
Message-ID: <E1CooxN-0004wf-QO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18951/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Updating for 2.2

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** circulation.tmpl	11 Dec 2004 21:01:15 -0000	1.6
--- circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
***************
*** 27,31 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode is not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
--- 27,31 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
! 				<li>The barcode was not found</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
***************
*** 33,37 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item withdrawn</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
--- 33,37 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="WTHDRAWN" -->
! 				<li>Item is cancelled</li>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="GNA" -->
***************
*** 60,67 ****
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Reserve waiting</p>
! 			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return &amp; issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
--- 60,70 ----
  			<!-- /TMPL_IF -->	
  			<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 				<p>Item is consigned for <!-- TMPL_VAR NAME="RESERVE_WAITING" --></p>
! 			<!-- /TMPL_IF -->
! 			<!-- TMPL_IF NAME="RESERVED" -->
! 				<p>Item is on reserve for <!-- TMPL_VAR NAME="RESERVED" --></p>
! 			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="ISSUED_TO_ANOTHER" -->
! 				<p>Item issued to <!-- TMPL_VAR NAME="ISSUED_TO_ANOTHER" -->. Return and issue?</p>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF NAME="TOO_MANY" -->
***************
*** 69,81 ****
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<form method="post">
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber">" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm issue" class="submit" />
! 			</form>
  			</div>
  			<!-- /TMPL_UNLESS -->
--- 72,89 ----
  			<!-- /TMPL_IF -->
  			<!-- TMPL_UNLESS name="IMPOSSIBLE" -->
! 			<div class="action"><form class="inline" method="post" action="/cgi-bin/koha/circ/circulation.pl">
! 				<!-- TMPL_IF NAME="RESERVED" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
! 				<!-- TMPL_IF NAME="RESERVE_WAITING" -->
! 					<p><input type="checkbox" id="cancelreserve" name="cancelreserve" value="1" /><label for="cancelreserve">Cancel Reserve</label></p>
! 				<!-- /TMPL_IF -->
  				<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
! 				<input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  				<input type="hidden" name="issueconfirmed" value="1" />
  				<input type="hidden" name="day" value="<!-- TMPL_VAR name="day" -->" />
  				<input type="hidden" name="month" value="<!-- TMPL_VAR name="month" -->" />
  				<input type="hidden" name="year" value="<!-- TMPL_VAR name="year" -->" />
! 				<input type="submit" value="Confirm Issue" class="submit" /></form><form class="inline" method="get" action="/cgi-bin/koha/circ/circulation.pl"><input type="hidden" name="borrnumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="submit" class="cancel" value="Don't Issue" /></form></div>
  			</div>
  			<!-- /TMPL_UNLESS -->




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.2
Message-ID: <E1Cop1n-0005Fb-IZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20148/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:36 -0000	1.2
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 21:23:03 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 12:23:03 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes basket.js,1.1,1.1.2.1
Message-ID: <E1Cop1D-0005D9-8Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19981/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	basket.js 
Log Message:
Synching with default tempalte

Index: basket.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/basket.js,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** basket.js	20 Oct 2004 19:15:06 -0000	1.1
--- basket.js	12 Jan 2005 20:23:00 -0000	1.1.2.1
***************
*** 149,152 ****
--- 149,155 ----
  		}
  		addSelRecords(c_value);
+ 	} else {
+ 		c_value = c_value + document.myform.bibid.value + "/";
+ 		addSelRecords(c_value);
  	}
  }
***************
*** 355,357 ****
--- 358,365 ----
          target.all['basket'].innerHTML = " ("+updated_value+")";
      }
+ }
+ 
+ function openBiblio(biblionumber) {
+ 	openerURL="opac-detail.pl?bib="+biblionumber;
+ 	opener.document.location = openerURL;
  }
\ No newline at end of file




From oleonard at users.sourceforge.net  Wed Jan 12 22:34:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:34:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.6.2.1
Message-ID: <E1Coq8F-0001Fp-OY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4752/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:34:18 -0000	1.6.2.1
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From oleonard at users.sourceforge.net  Wed Jan 12 22:37:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 12 Jan 2005 13:37:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/search.marc search.tmpl,1.6,1.7
Message-ID: <E1CoqB5-0001VL-5Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5730/koha-tmpl/intranet-tmpl/npl/en/search.marc

Modified Files:
	search.tmpl 
Log Message:
Changing operators for barcode and call number searches

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** search.tmpl	11 Dec 2004 15:30:16 -0000	1.6
--- search.tmpl	12 Jan 2005 21:37:09 -0000	1.7
***************
*** 67,71 ****
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
--- 67,71 ----
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="start" />
  				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
  		</tr>
***************
*** 75,79 ****
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>
--- 75,79 ----
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
  			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
  		</tr>




From acli at users.sourceforge.net  Thu Jan 13 07:01:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 22:01:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6,1.6.2.1 opac-top.inc,1.8,1.8.2.1
Message-ID: <E1Coy3T-0003sN-EU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14334

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
We need the http-equiv headers for non-iso8859-1 translations.
(Arguably it's a bug in tmpl_process3, but HTML::Mason needs it; it is
easier to fix it here.)


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** opac-basket-top.inc	24 Nov 2004 16:08:55 -0000	1.6
--- opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
***************
*** 5,8 ****
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** opac-top.inc	3 Jan 2005 10:58:46 -0000	1.8
--- opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
***************
*** 10,13 ****
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:22:38 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:22:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16,1.16.2.1
Message-ID: <E1CozJW-0006vS-Mn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26533

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Added http-equiv tag for non-iso-8859-1 charset support.  See bug 885.


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** opac-main.tmpl	3 Jan 2005 11:09:33 -0000	1.16
--- opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
***************
*** 9,12 ****
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
+ 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac-basket-top.inc,1.6.2.1,1.6.2.2 opac-top.inc,1.8.2.1,1.8.2.2
Message-ID: <E1Cozal-0007ez-DM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406/includes

Modified Files:
      Tag: rel_2_2
	opac-basket-top.inc opac-top.inc 
Log Message:
XML requires />


Index: opac-basket-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** opac-basket-top.inc	13 Jan 2005 06:01:46 -0000	1.6.2.1
--- opac-basket-top.inc	13 Jan 2005 07:40:24 -0000	1.6.2.2
***************
*** 5,9 ****
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
--- 5,9 ----
  <head>
  	<title>OPAC Basket</title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang">/includes/opac.css">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>

Index: opac-top.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -C2 -r1.8.2.1 -r1.8.2.2
*** opac-top.inc	13 Jan 2005 06:01:47 -0000	1.8.2.1
--- opac-top.inc	13 Jan 2005 07:40:24 -0000	1.8.2.2
***************
*** 10,14 ****
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">
--- 10,14 ----
  	<!-- /TMPL_IF -->
  	<title><!--TMPL_VAR name="LibraryName"--></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/includes/basket.js"></script>
  	<script language="JavaScript" type="text/javascript">




From acli at users.sourceforge.net  Thu Jan 13 08:40:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:40:27 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-main.tmpl,1.16.2.1,1.16.2.2
Message-ID: <E1Cozal-0007ex-BU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29406

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
XML requires />


Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-main.tmpl,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -r1.16.2.1 -r1.16.2.2
*** opac-main.tmpl	13 Jan 2005 07:22:35 -0000	1.16.2.1
--- opac-main.tmpl	13 Jan 2005 07:40:24 -0000	1.16.2.2
***************
*** 9,13 ****
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>
--- 9,13 ----
  		<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang"-->/includes/opac.css" />
  	<!-- /TMPL_IF -->
! 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
  	<title><!--TMPL_VAR name="LibraryName"--></title>
  </head>




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/fr/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k9-II@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/fr/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/fr/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvsHL2p76 and /tmp/cvsHehDJB differ




From acli at users.sourceforge.net  Thu Jan 13 08:42:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 12 Jan 2005 23:42:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/images front-background-small.gif,1.2,1.2.2.1
Message-ID: <E1Cozd3-0007k4-Bz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29596/en/images

Modified Files:
      Tag: rel_2_2
	front-background-small.gif 
Log Message:
Resized the "small" Koha logo to exactly 50px high (same size as specified
in the templates); this makes the logo appear nicer on the screen


Index: front-background-small.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/images/front-background-small.gif,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
Binary files /tmp/cvs5zEiwO and /tmp/cvsDnxCOi differ




From oleonard at users.sourceforge.net  Thu Jan 13 18:55:26 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:26 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help - New directory
Message-ID: <E1Cp9Bu-0005Pg-12@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20793/help

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities - New directory
Message-ID: <E1Cp9C7-0005Qb-9F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/authorities

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull - New directory
Message-ID: <E1Cp9C7-0005Qe-Fn@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/bull

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members - New directory
Message-ID: <E1Cp9C7-0005Qh-Hj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/members

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc - New directory
Message-ID: <E1Cp9C7-0005Qk-LM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/search.marc

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:55:39 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:55:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin - New directory
Message-ID: <E1Cp9C7-0005QY-71@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20839/admin

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005X1-Ns@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
	authorities.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1 nohelp.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XC-D2@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1 statecollection.tmpl,NONE,1.1 subscription-add.tmpl,NONE,1.1 subscription-detail.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XD-D5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N?{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N?2004/1, N?2004/2, N?2004/3, N?2004/4, N?2005/1, N?2005/2, N?2005/3, N?2005/4, N?2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N?{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N?2004/1,N?2004/2,N?2004/3,N?2004/4,N?2005/1,N?2005/2,N?2005/3,N?2005/4,N?2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1 members-home.tmpl,NONE,1.1 moremember.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XH-Dz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:21 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:21 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1 authorised_values.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1 biblio_framework.tmpl,NONE,1.1 branches.tmpl,NONE,1.1 categorie.tmpl,NONE,1.1 checkmarc.tmpl,NONE,1.1 currency.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1 itemtypes.tmpl,NONE,1.1 koha2marclinks.tmpl,NONE,1.1 marc_subfields_structure.tmpl,NONE,1.1 marctagstructure.tmpl,NONE,1.1 printers.tmpl,NONE,1.1 stopwords.tmpl,NONE,1.1 systempreferences.tmpl,NONE,1.1 z3950servers.tmpl,NONE,1.1
Message-ID: <E1Cp9Dl-0005Wx-36@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 18:57:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 09:57:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1
Message-ID: <E1Cp9Dm-0005XN-Dv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21220/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
	search.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 19:36:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:36:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.2 401.pl,1.1,1.2 402.pl,1.1,1.2 403.pl,1.1,1.2 404.pl,1.1,1.2 500.pl,1.1,1.2
Message-ID: <E1Cp9pH-0007fw-FJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29420/koha-tmpl/errors

Modified Files:
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:35:47 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 19:37:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 10:37:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/errors 400.pl,1.1,1.1.2.1 401.pl,1.1,1.1.2.1 402.pl,1.1,1.1.2.1 403.pl,1.1,1.1.2.1 404.pl,1.1,1.1.2.1 500.pl,1.1,1.1.2.1
Message-ID: <E1Cp9qg-0007ka-7F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29755/koha-tmpl/errors

Modified Files:
      Tag: rel_2_2
	400.pl 401.pl 402.pl 403.pl 404.pl 500.pl 
Log Message:
Adding KohaAdminEmailAddress to template

Index: 400.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/400.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 400.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/400.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 401.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/401.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 401.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/401.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 402.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/402.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 402.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/402.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 403.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/403.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 403.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/403.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 404.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/404.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 404.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/404.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);				
  output_html_with_http_headers $query, $cookie, $template->output;

Index: 500.pl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/errors/500.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.pl	30 Jul 2004 14:13:31 -0000	1.1
--- 500.pl	13 Jan 2005 18:37:29 -0000	1.1.2.1
***************
*** 10,13 ****
--- 10,14 ----
  
  my $query = new CGI;
+ my $admin = C4::Context->preference('KohaAdminEmailAddress');
  my ($template, $loggedinuser, $cookie)
  = get_template_and_user({template_name => "errors/500.tmpl",
***************
*** 18,20 ****
--- 19,22 ----
  				debug => 1,
  				});
+ $template->param( admin => $admin);
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 20:13:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:13:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.2 401.tmpl,1.1,1.2 402.tmpl,1.1,1.2 403.tmpl,1.1,1.2 404.tmpl,1.1,1.2 405.tmpl,1.1,1.2 500.tmpl,1.1,1.2
Message-ID: <E1CpAPI-0001LB-TS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5061/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:12:58 -0000	1.2
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:14:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:14:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/errors 400.tmpl,1.1,1.1.2.1 401.tmpl,1.1,1.1.2.1 402.tmpl,1.1,1.1.2.1 403.tmpl,1.1,1.1.2.1 404.tmpl,1.1,1.1.2.1 405.tmpl,1.1,1.1.2.1 500.tmpl,1.1,1.1.2.1
Message-ID: <E1CpAQe-0001PO-Rx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373/koha-tmpl/intranet-tmpl/default/en/errors

Modified Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Trimming HTML markup, improving translation, and adding KohaAdminEmailAddress

Index: 400.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 400.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 400.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 401.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 401.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 401.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 401</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that you aren't authorized to view this page</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 401</h2>
  <ul>
  <li>This error means that you aren't authorized to view this page</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 402.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/402.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 402.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 402.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 403.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/403.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 403.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 403.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 404.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/404.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 404.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 404.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 405.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/405.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 405.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 405.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,18 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
  <ul>
- 
- 
- 
- <div align="center"><font color="black"><b>Error 404</b> </div></font>
- <br>
- <br>
- <br>
- <br>
- 
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,11 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 404</h2>
  <ul>
  <li>This error means that the link was broken and that the page doesn't exist</li>	
! <li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>

Index: 500.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/errors/500.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** 500.tmpl	30 Jul 2004 14:46:48 -0000	1.1
--- 500.tmpl	13 Jan 2005 19:14:40 -0000	1.1.2.1
***************
*** 1,19 ****
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!--------------------------MAIN BODY OF PAGE-------------------------->
  <div id="mainbloc">
! <h1>One error happens !!</h1>
! <ul>
! 
! 
  
! <div align="center"><font color="black"><b>Error 500</b> </div></font>
! <br>
! <br>
! <br>
! <br>
! 
! <li>In koha this typically mean that the koha-team is working on a new options</li>	
! <li>Wait for a better version or mail the mainteners</li>
! <li>Use top menu bar to navigate again in koha.</li>
  </ul>
  </div>
--- 1,12 ----
  <!-- TMPL_INCLUDE NAME="error-top.inc" -->
! <!-- ------------------------MAIN BODY OF PAGE------------------------ -->
  <div id="mainbloc">
! <h1>An Error has Occurred!</h1>
! <h2>Error 500</h2>
  
! <ul>
! <li>In Koha this typically means that the Koha team is working on new features</li>	
! <li>Wait while system maintenance is being done or <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
! <li>Use top menu bar to navigate to another part of Koha.</li>
  </ul>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 20:41:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:41:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors - New directory
Message-ID: <E1CpAqs-0002nD-W8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10726/errors

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 20:42:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:42:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1 401.tmpl,NONE,1.1 402.tmpl,NONE,1.1 403.tmpl,NONE,1.1 404.tmpl,NONE,1.1 405.tmpl,NONE,1.1 500.tmpl,NONE,1.1
Message-ID: <E1CpArh-0002pn-Gx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10872/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 20:47:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 11:47:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/errors 400.tmpl,NONE,1.1.2.1 401.tmpl,NONE,1.1.2.1 402.tmpl,NONE,1.1.2.1 403.tmpl,NONE,1.1.2.1 404.tmpl,NONE,1.1.2.1 405.tmpl,NONE,1.1.2.1 500.tmpl,NONE,1.1.2.1
Message-ID: <E1CpAvu-00033Z-Fb@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/errors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11722/koha-tmpl/intranet-tmpl/npl/en/errors

Added Files:
      Tag: rel_2_2
	400.tmpl 401.tmpl 402.tmpl 403.tmpl 404.tmpl 405.tmpl 500.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 400: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 400: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 401: Authorization Required<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 401: Authorization Required</h2>

<ul>
<li>This error means that you aren't authorized to view this page</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 402: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 402: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 403: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 403: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 404: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 404: Page Not Found<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 405: Page Not Found</h2>

<ul>
<li>This error means that the link was broken and that the page doesn't exist</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->


--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Error 500: Internal Server Error<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>An Error has Occurred!</h1>
<h2>Error 500: Internal Server Error</h2>

<ul>
<li>In Koha this typically means that the Koha team is working on new features.</li>	
<li>To report this error, you can <a href="mailto:<!-- TMPL_VAR NAME="admin" -->">email the Koha Administrator</a>.</li>
<li>Use navigation menu to go to another part of Koha.</li>
</ul>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->





From oleonard at users.sourceforge.net  Thu Jan 13 21:21:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:21:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint - New directory
Message-ID: <E1CpBTU-0005J7-Cl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20362/maint

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint added to the repository
--> Using per-directory sticky tag `rel_2_2'





From oleonard at users.sourceforge.net  Thu Jan 13 21:22:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:22:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,NONE,1.1.2.1
Message-ID: <E1CpBU4-0005MK-TQ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20589/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
      Tag: rel_2_2
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME=allsub-p -->
<table>
<caption>Results</caption>
<!-- TMPL_LOOP NAME="loop" -->
<tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=modsub-p -->
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
<table>
<caption>Subject Heading Global Update</caption>
<tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
<input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
</table>
<input type="submit" value="Modify" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=upsub-p -->
Successfully modified <!-- TMPL_VAR NAME="oldsub" escape=html -->
is now <!-- TMPL_VAR NAME="sub" escape=html -->
<!-- <![ IGNORE [
<p><a href="/cgi-bin/koha/maint/catmaintain.pl" onclick="window0.focus()">Back to catalogue maintenance</a><br>
<a href=nowhere onclick="self.close()">Close this window</a>
]]> -->
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=undel-p -->
<table>
<thead>
<tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
<!-- TMPL_LOOP NAME="loop" -->
<tr>
<td><!-- TMPL_VAR NAME="title" escape=html --></td>
<td><!-- TMPL_VAR NAME="author" escape=html --></td>
<td><a href="/cgi-bin/koha/maint/catmaintain.pl?<!-- TMPL_VAR NAME="undelete" escape=url -->">Undelete</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=finun-p -->
<h3>Succesfully undeleted</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=fixitemtype-p -->
<form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
<table>
<tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
<input type="hidden" name="type" value="updatetype" />
<input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
</table>
<input type="submit" value="Change" class="submit" />
</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=updatetype-p -->
<h3>Updated successfully</h3>
<p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME=mainmenu-p -->
<div class="menu">
<h1>Catalog Maintenance</h1>
<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Subject Maintenance</caption>
<tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/search.pl" method="post">
<table>
<caption>Group Maintenance</caption>
<tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
<tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>

<form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
<table>
<caption>Undelete Biblio</caption>
<tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
</table>
<input type="submit" value="Show" class="submit" />
</form>
</div>
<!-- /TMPL_IF -->

</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:24:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:24:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.3,1.4
Message-ID: <E1CpBVp-0005VF-2F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21139/koha-tmpl/intranet-tmpl/npl/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** catmaintain.tmpl	19 Jul 2004 20:13:59 -0000	1.3
--- catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
***************
*** 1,9 ****
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
--- 1,15 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
+ <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
+ <table>
+ <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
+ </table>
  <!-- /TMPL_IF -->
  
***************
*** 11,20 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
- <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
--- 17,28 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
***************
*** 31,38 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
- <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 39,45 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 47,52 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
--- 54,59 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
***************
*** 54,61 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
--- 61,70 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
***************
*** 63,95 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->
--- 72,110 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
+ </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:27:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:27:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/maint catmaintain.tmpl,1.4,1.5
Message-ID: <E1CpBYu-0005jB-08@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21998/koha-tmpl/intranet-tmpl/default/en/maint

Modified Files:
	catmaintain.tmpl 
Log Message:
Replacing default template accidentally overwritten with NPL one

Index: catmaintain.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** catmaintain.tmpl	13 Jan 2005 20:24:06 -0000	1.4
--- catmaintain.tmpl	13 Jan 2005 20:27:16 -0000	1.5
***************
*** 1,15 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Maintenance<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
- <div id="main">
  <!-- TMPL_IF NAME=allsub-p -->
- <table>
- <caption>Results</caption>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr><td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html --></a></td></tr>
  <!-- /TMPL_LOOP -->
- </table>
  <!-- /TMPL_IF -->
  
--- 1,9 ----
! <!-- TMPL_INCLUDE NAME="cat-top.inc" -->
! 
  
  <!-- TMPL_IF NAME=allsub-p -->
  <!-- TMPL_LOOP NAME="loop" -->
! "<a href="/cgi-bin/koha/maint/catmaintain.pl?type=allsub&amp;sub=<!-- TMPL_VAR NAME="sub" escape=url -->" onclick="messenger('/cgi-bin/koha/maint/catmaintain.pl?type=modsub&amp;sub=<!-- TMPL_VAR NAME=sub2 escape=url -->');window1.focus()"><!-- TMPL_VAR NAME="subject" escape=html -->"</a><br>
  <!-- /TMPL_LOOP -->
  <!-- /TMPL_IF -->
  
***************
*** 17,28 ****
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <div class="error">This will change the subject headings on <strong>all</strong> the records this subject is applied to.</div>
! <table>
! <caption>Subject Heading Global Update</caption>
! <tr><td><label for="sub">Subject:</label></td><td><input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" id="sub" size="40" /><input type="hidden" name="type" value="upsub" />
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->" /></td></tr>
! </table>
! <input type="submit" value="Modify" class="submit" />
  </form>
  <!-- /TMPL_IF -->
  
--- 11,20 ----
  <!-- TMPL_IF NAME=modsub-p -->
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! Subject:<input type="text" value="<!-- TMPL_VAR NAME="sub" escape=html -->" name="sub" size="40"><br>
! <input type="hidden" name="type" value="upsub">
! <input type="hidden" name="oldsub" value="<!-- TMPL_VAR NAME="sub" escape=html -->">
! <input type="submit" value="modify">
  </form>
+ <p>This will change the subject headings on all the biblios this subject is applied to.
  <!-- /TMPL_IF -->
  
***************
*** 39,45 ****
  
  <!-- TMPL_IF NAME=undel-p -->
! <table>
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
--- 31,38 ----
  
  <!-- TMPL_IF NAME=undel-p -->
! <table border="0">
  <thead>
  <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
+ <tbody>
  <!-- TMPL_LOOP NAME="loop" -->
  <tr>
***************
*** 54,59 ****
  
  <!-- TMPL_IF NAME=finun-p -->
! <h3>Succesfully undeleted</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
--- 47,52 ----
  
  <!-- TMPL_IF NAME=finun-p -->
! Succesfully undeleted
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
***************
*** 61,70 ****
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <table>
! <tr><td><label for="itemtype">Itemtype:</label></td><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>" />
! <input type="hidden" name="type" value="updatetype" />
! <input type="text" name="itemtype" id="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>" /></td></tr>
! </table>
! <input type="submit" value="Change" class="submit" />
  </form>
  <!-- /TMPL_IF -->
--- 54,61 ----
  <!-- TMPL_IF NAME=fixitemtype-p -->
  <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
! <input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" escape=html>">
! <input type="hidden" name="type" value="updatetype">
! Itemtype:<input type="text" name="itemtype" value="<!-- TMPL_VAR NAME="item" escape=html>"><br>
! <input type="submit" value="Change">
  </form>
  <!-- /TMPL_IF -->
***************
*** 72,110 ****
  
  <!-- TMPL_IF NAME=updatetype-p -->
! <h3>Updated successfully</h3>
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a></p>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <div class="menu">
! <h1>Catalog Maintenance</h1>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Subject Maintenance</caption>
! <tr><td><label for="sub">Show all subjects beginning with: </label></td><td><input type="text" name="sub" id="sub"><input type="hidden" name="type" value="allsub" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/search.pl" method="post">
! <table>
! <caption>Group Maintenance</caption>
! <tr><td><label for="title">Show all Titles beginning with:</label></td><td><input type="hidden" name="type" value="catmain"><input type="text" name="title" id="title" /></td></tr>
! <tr><td><label for="item">Item Number:</label></td><td><input type="text" size="25" id="item" name="item" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
! 
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <table>
! <caption>Undelete Biblio</caption>
! <tr><td><label for="title">Show all Titles beginning with</label></td><td><input type="text" name="title" id="title" /><input type="hidden" name="type" value="undel" /></td></tr>
! </table>
! <input type="submit" value="Show" class="submit" />
  </form>
- </div>
  <!-- /TMPL_IF -->
  
! </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- 63,95 ----
  
  <!-- TMPL_IF NAME=updatetype-p -->
! Updated successfully
! <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalogue Maintenance</a>
  <!-- /TMPL_IF -->
  
  
  <!-- TMPL_IF NAME=mainmenu-p -->
! <b>Subject Maintenance</b><br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="allsub">
! Show all subjects beginning with <input type="text" name="sub"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Group Maintenance</b></br>
  <form action="/cgi-bin/koha/search.pl" method="post">
! <input type="hidden" name="type" value="catmain">
! Show all Titles beginning with <input type="text" name="title"><br>
! Item Number <input type="text" size="25" name="item"><br>
! <input type="submit" value="Show">
  </form>
! <p>
! <b>Undelete Biblio</b></br>
  <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
! <input type="hidden" name="type" value="undel">
! Show all Titles beginning with <input type="text" name="title"><br>
! <input type="submit" value="Show">
  </form>
  <!-- /TMPL_IF -->
  
! 
! <!-- TMPL_INCLUDE NAME="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 21:36:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:36:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/maint catmaintain.tmpl,1.1,1.2
Message-ID: <E1CpBhp-0006Ia-Cy@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/maint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24204/koha-tmpl/intranet-tmpl/npl/en/maint

Added Files:
	catmaintain.tmpl 
Log Message:
Synching with default tempalte





From oleonard at users.sourceforge.net  Thu Jan 13 21:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:41:11 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3,1.4
Message-ID: <E1CpBmJ-0006cd-5V@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25432/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Adding call number and item type to list of returned variables

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-shelves.pl	3 Jan 2005 11:09:34 -0000	1.3
--- opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
***************
*** 175,178 ****
--- 175,180 ----
  		$line{'title'}=$item->{'title'};
  		$line{'author'}=$item->{'author'};
+ 		$line{'classification'}=$item->{'classification'};		
+ 		$line{'itemtype'}=$item->{'itemtype'};				
  		$line{biblionumber} = $item->{biblionumber};
  		push(@itemsloop, \%line);
***************
*** 188,191 ****
--- 190,196 ----
  #
  # $Log$
+ # Revision 1.4  2005/01/13 20:41:07  oleonard
+ # Adding call number and item type to list of returned variables
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that has more features




From oleonard at users.sourceforge.net  Thu Jan 13 21:46:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:46:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion - New directory
Message-ID: <E1CpBrn-00071e-Mk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26941/suggestion

Log Message:
Directory /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion added to the repository





From oleonard at users.sourceforge.net  Thu Jan 13 21:48:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:48:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1 mail_suggestion_ORDERED.tmpl,NONE,1.1 mail_suggestion_REJECTED.tmpl,NONE,1.1
Message-ID: <E1CpBtV-0007Am-T1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27533/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 21:56:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 12:56:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,NONE,1.1.2.1 mail_suggestion_ACCEPTED.tmpl,NONE,1.1.2.1 mail_suggestion_AVAILABLE.tmpl,NONE,1.1.2.1 mail_suggestion_ORDERED.tmpl,NONE,1.1.2.1 mail_suggestion_REJECTED.tmpl,NONE,1.1.2.1
Message-ID: <E1CpC1b-0007ld-4O@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Added Files:
      Tag: rel_2_2
	acceptorreject.tmpl mail_suggestion_ACCEPTED.tmpl 
	mail_suggestion_AVAILABLE.tmpl mail_suggestion_ORDERED.tmpl 
	mail_suggestion_REJECTED.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestion Management
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">

<!-- TMPL_IF name="op_else" -->
	<h1>Suggestions Management</h1>
	<form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
	<input type="hidden" name="op" value="aorr_confirm">
	<table>
		<tr>
			<th>Status</th>
			<th>Suggestion</th>
			<th>Suggested by</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<select name="aorr">
						<option value=""> -- Choose Action --</option>
						<option value="R<!--TMPL_VAR name="suggestionid" -->">Reject</option>
						<option value="A<!--TMPL_VAR name="suggestionid" -->">Accept</option>
					</select>
				</td>
				<td><!-- TMPL_VAR NAME="title" --><!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br>
					<!-- TMPL_IF name="copyrightdate" -->&copy <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->; ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><br><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->

				</td>
				<td>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
		</table></form>
		<p><input type="submit" class="submit" value="Change Status"></p>

	
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your suggestion today, and found it interesting. The item will be ordered as soon as possible. You will be notified by mail when the order is completed, and again when the book arrives at the library.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the item is now part of the collection of the <!-- TMPL_VAR NAME="LibraryName" -->.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

We are pleased to inform you that the book has now been ordered. It should arrive soon, at which time it will be processed for addition to the collection.

You will be notified again when the book is available.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->
--- NEW FILE ---
Dear <!-- TMPL_VAR NAME="LibraryName" --> user,

You have suggested that the library acquire <!-- TMPL_VAR name="title" --><!-- TMPL_IF name="author" --> by <!-- TMPL_VAR name="author" --><!-- /TMPL_IF -->.

<!-- TMPL_VAR name="lib.surname" --> <!-- TMPL_VAR lib.firstname --> reviewed your request today, and has decided not to accept the suggestion at this time.

If you have any questions, please email us at <!-- TMPL_VAR name="libemail" -->.

Thank you,

<!-- TMPL_VAR NAME="LibraryName" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:48:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:48:54 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.3 members-home.pl,1.1,1.2
Message-ID: <E1CpCpq-0002Y9-5q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9792/members

Modified Files:
	member.pl members-home.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	13 Jan 2005 21:48:49 -0000	1.3
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	13 Jan 2005 21:48:50 -0000	1.2
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Thu Jan 13 22:50:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:50:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpCrO-0002fe-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10258/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 13 22:53:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 13:53:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.4
Message-ID: <E1CpCtu-0002qK-N1@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10913/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>




From oleonard at users.sourceforge.net  Thu Jan 13 23:39:35 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:39:35 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1
Message-ID: <E1CpDct-0005fe-He@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21773/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.16,1.17
Message-ID: <E1CpDeM-0005lv-QJ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22173/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Adding quick search link.  This opens a pop-up to allow for searching for member card number.  Choosing a member from the search results list closes the window and populates the card number field in request.pl template.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** request.tmpl	26 Nov 2004 20:47:06 -0000	1.16
--- request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
***************
*** 1,5 ****
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
--- 1,5 ----
  <!-- TMPL_INCLUDE Name="cat-top.inc" -->
  <div id="mainbloc">
! 	<form action="placerequest.pl" method="post" name="request">
  	<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="bib" -->">
  	<input type="hidden" name="type" value="str8">
***************
*** 22,26 ****
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
--- 22,26 ----
  			</select>
  		</p>
! 		<p><label class="label100">Member Number</label><input type="text" size="10" name="member"> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="openWindow('/cgi-bin/koha/members/members-home.pl?quicksearch=1', 'newwin'); return false;">(Quick Search)</a></p>
  		<p><label class="label100">Notes</label><input type="text" size="20" name="notes"></p>
  		<p><label class="label100">Date</label><!-- TMPL_VAR NAME="date" --></p>
***************
*** 149,151 ****
--- 149,162 ----
  	<!-- /TMPL_IF -->
  </div>
+ <script language="javascript" type="text/javascript">
+ 	// Set the value of the form field to the passed value and optionally shift
+ 	// focus and close the popup.
+ 	function FillForm(val,formname,formfield) {
+ 		document.forms[formname].elements[formfield].value = val;
+ 		// Uncomment below to shift focus after clicking link in popup.
+ 		document.forms[formname].elements[formfield].focus();
+ 		// Uncomment below to close popup after clicking link.
+ 		newwin.close();
+ 	}
+ </script>
  <!-- TMPL_INCLUDE Name="cat-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 13 23:41:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 13 Jan 2005 14:41:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1 member-quicksearch.tmpl,NONE,1.1
Message-ID: <E1CpDfB-0005o6-Jx@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22310/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
templates for member quicksearch (to allow quick member searching in popup from request page)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From shedges at users.sourceforge.net  Fri Jan 14 00:56:51 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 15:56:51 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr/sysadmin/migration migrer_ses_donnees.xml,NONE,1.1
Message-ID: <E1CpEpf-0001i3-CC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr/sysadmin/migration
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6557

Added Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml and move to migration directory

--- NEW FILE ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<article>
  <title>Param??trer et migrer ses donn??es vers Koha 2.2</title>

  <articleinfo>
    <pubdate>2005-01-06</pubdate>

    <author>
      <firstname>Paul</firstname>

      <surname>POULAIN</surname>

      <authorblurb>
        <para>Consultant ind??pendant en logiciels libres, Koha "Release
        Manager" pour la version 2.0 puis 2.2, membre du comit?? de pilotage
        international</para>
      </authorblurb>
[...1229 lines suppressed...]
  '011','','',
  'a' =&gt; $resul{ISSN},
);
newField = MARC::Field-&gt;new(
  '200','','',
  'a' =&gt; $resul{TIT},
  'b' =&gt; $resul{TYP},
  'e' =&gt; $resul{STI},
  'f' =&gt; $resul{AUT},
  'g' =&gt; $resul{NOT},
);
$newRecord-&gt;insert_fields_ordered($newField);
my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>

        <para>Notez que le code qui pr??c??de ne traite pas des notices
        d'exemplaire (l??, c'est vraiment trop sp??cifique)</para>
      </section>
    </section>
  </section>
</article>



From shedges at users.sourceforge.net  Fri Jan 14 01:00:09 2005
From: shedges at users.sourceforge.net (skemotah)
Date: Thu, 13 Jan 2005 16:00:09 -0800
Subject: [Koha-cvs] CVS: koha-doc/fr migrer_ses_donnees.xml,1.1,1.2
Message-ID: <E1CpEsr-0001tY-KC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha-doc/fr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7189

Modified Files:
	migrer_ses_donnees.xml 
Log Message:
validate xml (moved to migration subdirectory)

Index: migrer_ses_donnees.xml
===================================================================
RCS file: /cvsroot/koha/koha-doc/fr/migrer_ses_donnees.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** migrer_ses_donnees.xml	6 Jan 2005 15:25:36 -0000	1.1
--- migrer_ses_donnees.xml	13 Jan 2005 23:59:54 -0000	1.2
***************
*** 1,89 ****
! <?xml version="1.0" encoding="ISO-8859-15"?>
! <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
! <book>
!   <title>Param?trer et migrer ses donn?es vers Koha 2.2</title>
  
!   <chapter>
      <title>Introduction</title>
  
!     <articleinfo><pubdate>2002-01-06</pubdate> <author>
[...2041 lines suppressed...]
  
!         <para>Notez que le code qui pr?c?de ne traite pas des notices
!         d'exemplaire (l?, c'est vraiment trop sp?cifique)</para>
        </section>
      </section>
!   </chapter>
! </book>
\ No newline at end of file
--- 1259,1268 ----
  );
  $newRecord-&gt;insert_fields_ordered($newField);
! my ($bibid,$oldbibnum,$oldbibitemnum) = NEWnewbiblio($dbh,$newRecord,'') unless ($test_parameter);</programlisting>
  
!         <para>Notez que le code qui pr??c??de ne traite pas des notices
!         d'exemplaire (l??, c'est vraiment trop sp??cifique)</para>
        </section>
      </section>
!   </section>
! </article>
\ No newline at end of file




From oleonard at users.sourceforge.net  Fri Jan 14 16:41:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:41:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help bull-home.tmpl,NONE,1.1.2.1 nohelp.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTa1-0008IT-54@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31882/koha-tmpl/intranet-tmpl/npl/en/help

Added Files:
      Tag: rel_2_2
	bull-home.tmpl nohelp.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
		<p>If you want to create a new subscription, click the "Add subscription" button.</p>
		<p>Once you have found the subscription you need, you can: </p>
			<ul>
				<li>View subscription details</li>
				<li>Recieve any item and/or manage what appears in subscription summary (in OPAC and librarian interface)</li>
	</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: No help for this topic!<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

	<div id="main-compact">
	<h1>Online Help</h1>
	<p>Sorry, there is no help available for this topic</p>
	</div>
<!-- TMPL_INCLUDE NAME="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc search.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lg-Ua@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/search.marc

Added Files:
      Tag: rel_2_2
	search.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Search</h1>
	<p>The search id divided in 2 differents parts :</p>
	<h2>Usual fields</h2>
	<p>The usual fields are in the top part of the screen. They contains :</p>
		<ul>
			<li>Keyword : search on anything</li>
			<li>Title</li>
			<li>Author</li>
			<li>Barcode : the library barcode of the book</li>
			<li>Illustrator</li>
			<li>Dewey</li>
			<li>Item type : select here an item type. If none is selected, the search is done on every item type</li>
			<li>Branch : select here a specific branch. If none selected, the search is done on every branch</li>
		</ul>
	<p>Search method</p>
		<ul>
			<li>If you enter values in more than 1 field, the search is "and-ed" (biblios that contains <b>title</b> AND <b>author</b>)</li>
			<li>A biblio is selected if it's field <b>contains</b> the term you entered</li>
			<li>If you enter a * (or a %) at the end of a term, Koha search for words starting with your term (entering <b>lower*</b> means : find biblio that have a <b>title containing a word starting by lower</b></li>
		</ul>
	<h2 class="catalogue">Complete MARC search</h2>
	<p>In the lower part of the search screen, the <b>More fields</b> box let you enter whatever you want : and, or, exclusions (not), search on any MARC field/subfield</p>
	
	<p><b>IMPORTANT NOTE : </b>for performance reasons, the * is valid only if you enter a word more than 3 letters long. for words of 3 letters or less, the * is <b>ignored</b></p>
	<br/>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/bull bull-home.tmpl,NONE,1.1.2.1 statecollection.tmpl,NONE,1.1.2.1 subscription-add.tmpl,NONE,1.1.2.1 subscription-detail.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LR-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/bull

Added Files:
      Tag: rel_2_2
	bull-home.tmpl statecollection.tmpl subscription-add.tmpl 
	subscription-detail.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription help</h1>
	<p>Search for a subscription by using the filter button (with a ISSN or a title). If you enter a title, you can use the wildcard % : entering <b>%Times%</b> returns every subscription containing Times in the title. Entering <b>New York%</b> returns every subscription with title starting with New York</p>
	<p>If you want to create a new subscription, click on "Add subscription"</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Issues and Summary<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials issues and summary</h1>
	<p>This screen is divided in 2 parts</p>
	<h2>The right part</h2>
	<p>The right part deals with issues. When you create a new subscription, the 1st issue is automatically calculated. When you want/need, you can define issues that have a new status:</p>
	<ul>
		<li>Arrived : when an book arrives, you can set it's status to "arrived". Then, the issue disappear from this list, and the number of the issue is added to the "arrived list" (on the left box)</li>
		<li>Late : means that the book is late and should be arrived. A books changed to "late" status stays on the issue list, and the next waited number is generated</li>
		<li>Missing : means the book will never arrive. The issue disappear from the list, and the number of the issue is added to the "missing list" (on the left box)</li>
	</ul>
	<h2>The left part</h2>
	<p>the left part contains 6 differents informations, that are automatically calculated for some of them, but that you can change<p>
	<ul>
		<li>Subscription beginning date : the date of the beginning of the 1st subscription. Should not be modified and is not modified automatically by subscriptions renewals</li>
		<li>Subscription enddate : must be entered manually when the subscription is definetly closed</li>
		<li>Arrived numbers : the list of issues you have in your library. Automatically filled when a new number is marked "arrived". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>Missing numbers : the list of issues you don't have in your library, and that will never arrive (or have been lost). Automatically filled when a new number is marked "missing". You can manually change this field if you want, for example, to change a long list (1,2,3,4,...,51) to a shorter one (1-51)</li>
		<li>opac note : the field that appears in the OPAC (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically</li>
		<li>opac note : the field that appears in the librarian interface (with some other subscription information like beginning date and end date. This field must be filled manually. Nothing is put here automatically.</li>
	</ul>
	<h2>Subscription renewals</h2>
	<p>Koha calculates automatically the end of the subscription (based on the start date and the number of issues recieved). when a subscription has ended, you can't change the status of the last "waited number" (as it's not waited in fact). To be able to "recieve" this number, you must renew your subscription.</p>
	<p>Renewing a subscription means that you define some informations for the renewal. When those informations have been filled, a suggestion is automatically created in Koha. This suggestion can be managed by the librarian that orders books, as any other order (= budget and bookseller are defined here).</p>
	<p><i>Note that the subscription renewal done by the "serials librarian" is supposed to be immediate. We have decided to keep Koha as simple as possible. In fact, the subscription renewal won't be immediate, but we didn't wanted to add too much complexity.</i></p>
	</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials -- Adding Subscriptions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription add and modify help</h1>
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of issues recieved can be a complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
		Consider the formula <b>N?{X}/{Y}</b>. The following XYZ settings :
		<ul>
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
		</ul>
		will result in the following issues numbers :
		<p>N?2004/1, N?2004/2, N?2004/3, N?2004/4, N?2005/1, N?2005/2, N?2005/3, N?2005/4, N?2006/1</p>
		<p>
			<b>Note:</b> when you add a subscription, Koha consider you already have done the order, or that you will do it soon. So, NO information is sent to the acquisition module. This is not the case when the subscription expires. In this case, a subscription renewal creates a "suggestion" that is sent to the acquisition module.
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Serials Subscription Detail<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Serials subscription detail help</h1>
	In this screen, you can see subscription detail, and modify it if you need.
	<ul>
		<h2>Subscription information bloc</h2>
		<p>it contains the name of the librarian that created the subscription, the name of the supplier providing the subscription, the cost and the budget affected. It also contains the title of the biblio managed by the subscription.</p>
		<h2>Planning information bloc</h2>
		<p>it contains various information to calculate arrival dates.</p>
		<h2>Subscription length</h2>
		<p>one field in this bloc should be filled : the subscription length can be calculated in weeks, months or number of issues to recieve</p>
		<h2>Numbering calculation</h2>
		<p>The numbering of items recieved can contain complex formulas. The "numbering formula" can be filled with any text and/or numbers. 3 special tokens <b>{X} {Y}</b> and <b>{Z}</b> can be user to define the calculation formula. XYZ values are calculated with the following method:</p>
			<ul>
				<li>Add : the number here is added to XYZ</li>
				<li>once every : the number before can be added on every issue or less often</li>
				<li>When more than : if the calculated number is more than the value here</li>
				<li>Set back to : if the previous condition is valid, the calculated number is set to this one instead</li>
				<li>Last value / begins with : the last value calculated or the 1st value (when adding a subscription</li>
			</ul>
		<h2>Sample</h2>
			Consider the formula <b>N?{X}/{Y}</b>. The following XYZ settings :
			<li> <b>X</b> add <b>1</b> once every <b>4</b> times. When more than <b>9999999</b> set back to <b>empty</b>. Begins with <b>2004</b></li>
			<li> <b>Y</b> add <b>1</b> once every <b>1</b> times. When more than <b>4</b> set back to <b>4</b>. Begins with <b>1</b></li>
			will result in the following issues numbers :
			<b>N?2004/1,N?2004/2,N?2004/3,N?2004/4,N?2005/1,N?2005/2,N?2005/3,N?2005/4,N?2006/1
		<p>
		</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/admin aqbookfund.tmpl,NONE,1.1.2.1 authorised_values.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 branches.tmpl,NONE,1.1.2.1 categorie.tmpl,NONE,1.1.2.1 checkmarc.tmpl,NONE,1.1.2.1 currency.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1 itemtypes.tmpl,NONE,1.1.2.1 koha2marclinks.tmpl,NONE,1.1.2.1 marc_subfields_structure.tmpl,NONE,1.1.2.1 marctagstructure.tmpl,NONE,1.1.2.1 printers.tmpl,NONE,1.1.2.1 stopwords.tmpl,NONE,1.1.2.1 systempreferences.tmpl,NONE,1.1.2.1 z3950servers.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTaq-0008LN-A3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/admin

Added Files:
      Tag: rel_2_2
	aqbookfund.tmpl authorised_values.tmpl authtypes.tmpl 
	biblio_framework.tmpl branches.tmpl categorie.tmpl 
	checkmarc.tmpl currency.tmpl issuingrules.tmpl itemtypes.tmpl 
	koha2marclinks.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl stopwords.tmpl 
	systempreferences.tmpl z3950servers.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Book Fund Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">

<h1>Book Fund Administration</h1>

<p>The first time you access this page, you will be asked to add your first book fund -- thereafter you will also have the option of editing and deleting book funds.</p>

<p>Book Funds may be ignored if you are setting your System Preferences to "simple" acquisitions: the funds are only useful when using "normal" acquisitions.</p>

<p>"Book Funds" are accounts that you establish to keep track of your expenditures for library materials. They may be used for any kind of material, not just books, and should match the lines in your materials budget. For instance, if your library establishes a budget line for books, another for audiovisual materials, a third line for magazines, and a fourth budget line for electronic databases, then you would have four Book Funds.</p>

<p>Each Book Fund has a unique fund code, limited to no more than five characters, that identifies it. You should decide on your fund codes (e.g. something like BOOKS, AV, MAGS, DATA for the four book funds described above) and enter the code in the "Book fund" box, then a full name in the "Name" box.</p>

<p>Once you have set up a fund, you will see a link to a page for setting up the fund budget. Here you will enter the beginning and ending dates of your budget year and the amount of money in that particular budget line. Do not use any kind of currency notation (like "$") or commas when entering the number. (Commas will be converted to decimal points.) NOTE: Your dates will not saved correctly unless you have set your date format in the System Preferences section of the Parameters page -- DO THIS BEFORE setting budgets.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authorised values management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Authorised values management</h1>
<p>Koha allows you to restrict the values that catalogers can place in some MARC subfields to certain pre-defined "authorised" values. These authorised values are defined here.</p>

<p>For example, if your Koha installation is used by several libraries, and you use MARC21, you might want to restrict the 850a MARC subfield to the instition codes for just those libraries. In that case, you could define a new authorised values category (perhaps called "INST") and enter the institution codes as the authorised values for that category. Once the 850a subfield is linked to the INST authorised values category in your MARC tag structure, catalogers must choose a value from the list you define here, and may not type in any other value.</p>
<ul>
<li>HINT : if a subfield is non mandatory, Koha automatically adds an empty value to the authorised value list, that is selected by default. If the subfield is mandatory, no empty value is added (and you should NOT add it in the list, as it's an illegal value !)</li>
<li>HINT2 : in the MARC editor, the list is ordered by Text, NOT by value. So you can define a default value by putting a space before the value you want to see first. For example, if your list is related to language, you can set "ENG" as authorised value and " English" as text. The space will order "ENG" as first default value, and the space won't be shown (because HTML automatically discard useless spaces). Super hint : you can put a value 1st with N spaces, then another one 2nd with N-1 space,..., a value in Nth position with 1 space. Don't abuse of this feature, it's easier to find a value in an alphabetical order. It should be used only to have a default value</li>
</ul>
<p>Koha automatically sets up authorised value categories for your item types and branch codes, and you can link these authorised values to MARC subfields when you set up your MARC tag structure.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Authority types<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Authority types</h1>
	<p>You can define as many Authority types as you want.</p>
	<ul>
		<li>with the MARC structure button, you can define the MARC structure of a given authority type</li>
		<li>The tag reported must contain a MARC tag number. Every subfield in the selected tag will be copied to the "destination tag" in the biblio. for example, in UNIMARC, the tag 200 ot personal authority will be reported to 600, 700, 701, depending on what is cliqued in the biblio MARC editor.</li>
		<li>The summary contains an "ISBD" like description to explain how the entry must be shown in the result list. The syntax is : 
		<ul>
			<li>[xxxFFFSyyy] where xxx are up to 3 digits BEFORE the field, FFF the field number, S the subfield code, yyy up to 3 digits AFTER the field.</li>
			<li>things outside [] are kept as is (including HTML)</li>
			<li>repeatable fields are manages.</li>
		<ul>
	</ul>
	<p>IMPORTANT</p>
	<p>
		In the biblio framework, the reported tag <b>MUST</b> contain a $9 subfield, activated in the tab where the tag is, and hidden (hidden maybe omitted, but the field has no reason to appear anywhere). The $9 subfield in the biblio will contain the Authority number (the internal Koha number)
	</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Biblio framework<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
	<h1>Biblio framework</h1>
	<p>biblio frameworks are used to catalogue your biblios.</p>
	<p>Unlike Koha 2.0, in this version you can have more than 1 framework to catalogate differently various materials. You can, for example, define 1 framework for monographies, 1 framework for serials, 1 framework for URL...</p>
	<p>Once a framework type is created, you can clic on "MARC structure" to define the exact MARC structure. The first time, Koha will ask you to select an existing framework to copy into the new one. Thus, you don't have to define all the MARC structure</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Branches<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
<h1>Help: Library Branches</h1>

<p>Fill in information about your library service outlets on this page.</p>

<p>Begin by defining your branch categories. If, for example, you have one main library and several branch libraries, you might set up an "M" (Main) category and a "B" (Branch) category, with descriptions "Main Library" and "Branch Library."</p>

<p>Now add the names and addresses, phone numbers, etc of your libraries in the "Branches" section. (All of your libraries should be described here, not just the branch libraries.) Give each library a unique and easily-remembered code (maximum of four characters). This code will be used in Koha's database to identify each library. When libraries are listed in Koha, they will be listed in alphabetical order by code. (Note that until you set your branch the first time you use a computer to circulate items in Koha, the branch will default to the first library in the alphabetical code list -- be careful to set the branch the first time you use Koha or whenever you add a new computer!)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Borrower Categories<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Borrower Categories</h1>

<p>Here is where you define the types of users of your library and how they will be handled.</p>

<h2>Category Code and Description</h2>
<p>Start by assigning a Category Code and a Description to each borrower type. The code is limited on no more than two characters and may be anything you choose. Four codes, however, have special meaning for Koha :</p>
<ul>
	<li>"I" can be used for institutional members, like other libraries that borrow from you, in which case Koha expects slightly different information about the institution;</li>
	<li>"A" (Adult) and "W" can be linked as "guarantors" to other borrowers who are their dependents.</li>
	<li>"C" (Children) is a borrower category that has a "guarantor"</li>
</ul>

<h2>Enrollment Period</h2>
<p>Enrollment period is a number indicating how many years a user's enrollment is valid. If you consider enrollments to expire after four years for example (as in a school, perhaps), then set this number to 4. If enrollments never expire, set this to an impossibly high number (99).</p>

<h2>Upper Age Limit and Age Required</h2>
<p>Upper Age Limit and Age Required set the age parameters for this type of user. If you issue children's cards to users between the ages of 2 and 18, for example, then Age Required would be "2" and Upper Age Limit would be "18." If there is no upper age limit, set this value to 99 (the highest allowed).</p>

<h2>Enrollment Fee and Reserve Fee</h2>
<p>Enrollment Fee and Reserve Fee (if any) should be entered either as whole numbers or with six decimal places, with no currency notation (e.g. "1.250000" instead of "$1.25").</p>

<h2>Overdue Notice Required</h2>
<p>Overdue Notice Required lets you bypass generating overdue notices for this user type.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC Check<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC Check</h1>
<p>Once you have completed the process of setting up your MARC tag structure (MarcTagstruct) and checked your MARC to Koha mapping (Koha2MarcLinks), click on this link to activate a small program that checks for major errors in your MARC setup.</p>

<p>This MARC check does not guarantee that you will like the first results of your efforts to set up your MARC displays, etc. -- it simply checks for major errors. You will probably revise your MARC setup several times before you are completely pleased with it. Be sure to run checkmarc after every revision.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Currencies administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Currencies administration</h1>
<p>Define the currencies you deal with here.</p>

<p>You should at least define your local currency here, giving it a name (like US DOLLAR or EURO) and setting the "rate" at 1. If you do business with vendors who charge in a different currency, enter a name for that currency (e.g. PESO) and set the approximate exchange rate compared to your currency. (Note: names are limited to 10 characters or less.) The exchange rate is used to calculate the remain balances in your materials budgets when you purchase materials using "normal" acquisitions.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Issuing rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Issuing rules</h1>
<p>Issuing rules deals with 2 topics :</p>
<ul>
	<li>Issuing length and quantity : they say how many items and how long a borrower category can issue for an itemtype </li>
	<li>Overdue charges : they are based on the item type and borrower type. These charges are defined on this page.</li>
</ul>
<p>Itemtypes and borrower categories must be defined before issuing rules are defined. Your defined items types and borrower categories are then displayed in a grid on this page.</p>

<h2>Issuing length and quantity</h2>
<p>Each box in the grid contains 2 numbers, separated by commas, defining how many days a given borrower type can issue how many material. For example : 21,5 means the borrower can issue up to 5 books for up to 21 days</p>
<p>The <b>*</b> have a specific meaning. They mean "any". If you set 21,5 for itemtype=*, borrower category=student, branch=main, then a student can't issue more than 5 items of ANY item type. This "any" box is cumulative with other boxes. It means that 21,5 as itemtype=book, 14,2 as itemtype=CD and 30,6 as itemtype=* (with category=student) means a student can issue up to 5 books, up to 2 CD but a maximum of 6 items (books or CD). In this case the "30 days" in itemtype=* is discarded and the issuing length is calculated on the exact itemtype</p>

<h2>Overdue charges</h2>
<p>Each box in the grid contains three numbers separated by commas, defining the fine, how many days overdue the item must be before the fine is assessed and a first notice prepared (the "grace period"), and how many days after that the fine is assessed again and a second notice sent. For example, if you charge adults 1 dollar (or euro, or whatever currency) for overdue videos after three days and add another dollar charge after another five days, put "1,3,5" in the box in the grid that aligns with "Adult" and "Video." If you charge adults 25 cents for overdue fiction books after a grace period of seven days and repeat the charge seven days later, then the entry in the corresponding box in the grid would be ".25,7,7". After the first and second notice are given, Koha prepares a "final notice" after the number of days set by the final number in the grid and sets the charge to the maximum, which is 5.</p>

<p>(Note : fines are calculated by the fines2.pl script, located in misc directory. Ask your system administrator to put this script in crontab, after midnight, to have fines calculated every night.)</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Item types management<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Item types management</h1>
<p>You can define as many itemtypes as you want.</p>

<p>The item types are the "categories" into which your library items fall. For instance, you probably want to have videocassettes in a different category from non-fiction books, and mysteries in a different category from children's picture books. If you already are using a commercial ILS, you almost certainly already have all of your materials divided up into such categories. Now you need to tell Koha what your categories are.</p>

<p>The itemtype code is limited to four characters. This code is rarely displayed by Koha; instead the description of the type will be what users see.</p>

<p>"Rental charge" is any amount you might charge to users for borrowing items of a certain type (like videos).</p>

<p>"Renewals allowed" says how many times an items of this type may be renewed.</p>

<p>Item types are useful for many things, and <b>very</b> important in controlling how Koha works :</p>
<ul>
    <li>Borrowers can search on itemtypes</li>
    <li>Issuing rules are set for item types (and for borrower types / branches)</li>
</ul>
<p>Setting up item types is one of the first things you should do after installing the Koha software.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Koha 2 MARC links<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Koha 2 MARC links</h1>
<p>This page provides a simplified way to map your MARC tags and subfields to the non-MARC Koha database tables <b>for default biblio framework</b>. This can also be done while setting the MARC tag structure, but it is easier to see the relationship between the MARC database and the Koha database here.</p>

<p>The pull-down menu lists all the Koha tables that can receive values from the MARC records. The columns from each table are listed below the pull-down menu.</p>

<p>Do not expect to have every Koha table.column mapped to a MARC subfield. Some (such as biblionumber, biblioitemnumber, and itemnumber) are values generated by Koha and will probably be automatically mapped. Others are flags which are set in the course of normal circulation activities and will contain information that is not part of your MARC record.</p>

<p>This is a one-to-one mapping. In other words, a MARC tag/subfield can be mapped to one, and only one, Koha table.column.</p>

<p>MARC data that is not mapped to a Koha table does not disappear -- it is simply not available for display on circulation screens and on some search results screens.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- MARC tag structure administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>MARC tag structure administration</h1>
<p>Koha allows you to specify which MARC tags you want to use and which you want to ignore. When you downloaded and installed Koha, you also got the entire list of MARC21 tags and subfields in current use. Now you need to use the administration page to edit this list and tell Koha which tags you want to use and how you want to use them.</p>
<p>You can define as the marc tag structure for each biblio framework you have defined</p>

<p>If you are CERTAIN that you will never use a MARC tag, then you can delete it, but since this will not result in any appreciable improvement in performance, it is probably better to leave it. There will be tags you want to add, however. If you are using older MARC tags that are not in the list of tags supplied with Koha, then use the MARC tag structure administration page to add them. Similarly, you will probably need to add the holdings tag you currently use, or at least check the subfield structure of the 852 tag if you use it for holdings.</p>

<p>Editing the SubFields from the MARC tag structure page is very time-consuming, but also very important; be sure to click the subfield link for each tag in your MARC tag structure.</p>
<p>For each subfield you can set :</p>
<ul>
<li>repeatable : wether it can be repeated or not. If it can be repeated, separate the values by a | in the MARC editor when you want to have the subfield twice</li>
<li>Mandatory : wether the field is mandatory or not. If mandatory, the cataloger can't validate the biblio if the subfield is empty.</li>
<li>Search also : a list of field that Koha will also search on when the user do a search on the subfield</li>
<li>Koha link : <b>very important</b>. Koha is multi-MARC compliant. So, it does not know what the 245$a means, neither what 200$f (those 2 fields being both the title in MARC21 and UNIMARC !). So, in this list you can "map" a MARC subfield to it's meaning. Koha constantly maintains consistency between a subfield and it's meaning. When the user want to search on "title", this link is used to find what is searched (245 if you're MARC21, 200 if you're UNIMARC).</li>
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. All subfields of a given field must be in the same tab or ignored : 1st it's more logic, 2nd, Koha would be confused to repeat repeatable fields otherwise !!!</li>
<li>hidden : means that the field is managed, but NOT shown in opac. It's usually for internal fields</li>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorised value list of the selected type</li>
<li>thesaurus : means that the value is not free, but can be searched in authority/thesaurus of the selected category</li>
<li>plugin : means the value is calculated or managed by a plugin. Plugins can do almost anything. For example, in UNIMARC there are plugins for every 1xx fields that are coded fields. The plugin is a huge help for cataloger ! There are also two plugins (unimarc_plugin_210c and unimarc_plugin_225a that can "magically" find the editor from an ISBN, and the collection list for the editor)</li>
<li>link : useless for instance</li>
</ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Printer Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Printer Administration</h1>
<p>If you are going to be using a printer (or several printers) that are attached to your Koha server for producing statistical and operations reports, then you need to give each printer a name and tell Koha how to access it. You do this by telling Koha which print queue to use.</p>

<p>(In linux, each printer configuration in your printcap file defines a print queue. The default print queue is "lp," but if you use more than one printer you will have other queues, probably with names like "text" or "postscript." Tell Koha which printer queue(s) you want to use for printing reports directly from the server.)</p>

<p>Note that you can always print Koha screens directly to a printer attached to your workstation just by using your web browser's Print function.</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Stop word administration page<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Stop word administration page</h1>
<p>Here you should list all of the words you wish Koha to ignore when performing catalog searches or building the keyword index.</p>

<p>Normally, you will not want Koha to save keyword references to articles like "The" and "A" and other very common words. Saving keyword references to these words does not help to limit a search and will make the keyword index very large and "cluttered" with words that are not really useful. The "stopwords" list defines these unnecessary words for your installation.</p>

<p>(Hint: If you are proficient at MySQL, it is often faster and easier to find an existing stopwords list, edit it, put it in the correct format, and use the MySQL "Load Data Infile" command to import the list into the stopwords table. Many academic libraries publish their stopwords list on the Internet, or you can ask other Koha libraries if they would share their stopword list.)</p>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- System preferences administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>System preferences administration</h1>
<p>This page allows you to set the system preferences that control much of the basic behavior of Koha. These parameters should be set before any other parameters.</p>
<ul>
<li><b>acquisitions --</b> The choices are either "normal" or "simple." "Normal" sets the system to track orders and update budgeting and vendor information as you add materials to your collection. "Simple" tells Koha that you are going to add materials to the collection without tracking orders.</li>

<li><b>authoritysep --</b> The separator used in authority/thesaurus. Usually " -- ". Deprecated and useless in Koha 2.2</li>

<li><b>autoBarcode --</b> The barcode number to be assigned to items is automatically assigned (sequentially) by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>autoMemberNum --</b> The membership number (patron card number) to be assigned to new library users is automatically assigned by Koha if this is set to "yes" ("1" = "yes").</li>

<li><b>checkdigit --</b> Validity checks on membership number (patron card number): none or "Katipo" style checks. In most cases, you will choose "none" because you will be using pre-printed barcodes.</li>

<li><b>dateformat --</b> Choose "metric," "us," or "iso" date format (us = mm/dd/yyyy, metric = dd/mm/yyy, ISO = yyyy/mm/dd). This controls how dates are displayed, not how they are stored in the database.</li>

<li><b>gist --</b> "gist" is "GST" (Good and Sales Tax) rate. If your local tax laws require you to pay taxes on purchases from your suppliers, enter the tax rate here. Set to "0" if you are not required to pay tax.</li>

<li><b>insecure --</b> The best choice is "no." If you choose "yes," users do not have to login and all information is open to anyone. Be careful if you set this to "yes!"</li>

<li>
	<p><b>ISBD --</b> Koha can display records in International Standard Bibliographic Description format. the syntax of this field is quite complex : </p>
	<p>it's divided into blocks, that can contain a text before, X fields, each having -or not- a string before, a string after, and a text after :</p>
	<p><b>#995|&lt;br&gt;Items :|{\n995b}{ - 995j}{/995k}|</b></p>
	<p>means the "block" 995 has &lt;br&gt;Items : BEFORE, then fields 995b, 995j and 995k, repeated for each item (995 is an UNIMARC standard), then nothing after the block.</p>
	<p> The # means "beginning of a block", the | is the separator of each part, the {} being used for each subfield. A subfield can have up to 3 digits BEFORE and up to 3 digits AFTER each subfield</p>
	<p>The UNIMARC (partial) definition for ISBD is </p><i>
	<p>#700|<label>Titre/auteur</label>|{700a}{701a}{702a}| ;
		#200||{200a}{ [200b] }{. 200c}{ : 200e}{. 200h}{. 200i}{ / 200f}{ ; 200g}|<br/>
		#230||{ ; 230a}|<br/>
		#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|<br/>
		#210|&lt;br/&gt;&lt;label&gt;Editeur&lt;/label&gt;|{ ; 210a}{ (210b) }{ : 210c}{, 210d}|<br/>
		#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)<br/>
		#215|&lt;br/&gt;&lt;label&gt;&nbsp;&lt;/label&gt;|{ ; 215a}{ : 215c}{ ; 215d}{ + 215e}|<br/>
		#225|&lt;br/&gt;&lt;label&gt;Description&lt;/label&gt;|{ (225a}{ = 225d}{ : 225e}{. 225h}{. 225i}{ / 225f}{, I225x}{ ; 225v}|)<br/>
		#606|&lt;br/&gt;&lt;label&gt;Sujets&lt;/label&gt;|{ 606a - }|&lt;br/&gt;&lt;br/&gt;<br/>
		#995|&lt;br&gt;Exemplaires :|{\n995b}{ - 995j}{/995k}|<br/>
	</i></p>
</li>

<li><b>KohaAdminEmailAddress --</b> The email address that will receive requests from borrowers for modification of their records.</li>

<li><b>ldapserver and ldapinfos --</b> Koha 2.0 can use Perl LDAP (Lightweight Directory Access Protocol, see http://search.cpan.org/~gbarr/perl-ldap-0.3202/lib/Net/LDAP.pod) to manage user access and privileges. To avoid a useless Perl package for libraries without ldap, all what is related to LDAP has been moved to KohaInstall/modules/C4/Auth_with_ldap.pm. Ask your system administrator to set up LDAP with Auth_with_ldap.pm (perldoc Auth_with_ldap.pm for help). Those 2 parameters are useless in 2.2 and have should not appear on a new install.</li>

<li><b>LibraryName --</b> The library name or message that will be shown on the main OPAC page. You may use HTML tags to format the name. Example: Welcome to <i>Koha<br/>Free Software ILS</i></li>

<li><b>marc --</b> Turn on MARC support. Set to "no" if you do not intend to use MARC records.</li>

<li><b>marcflavour --</b> Your MARC flavor (MARC21 or UNIMARC). This choice tells Koha how to interpret your MARC records.</li>

<li><b>maxoutstanding --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from making reserve requests. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>maxreserves --</b> The maximum number of reserves a member can make.</li>

<li><b>noissuescharge --</b> The maximum amount of outstanding charges a borrower may have before he/she is barred from checking out items. The number represents units of your local currency (e.g. "5" means $5.00, if the dollar is your local currency.)</li>

<li><b>opaclanguages --</b> Set your language preference. (Despite the name, this choice controls the language used for all Koha screens, not just the OPAC). The top language in your list will be tried first.</li>

<li><b>opacthemes --</b> Set the preferred order for themes. The top theme will be tried first.</li>

<li><b>printcirculationslips --</b> if set to 1, circulation "slips" are printed on your receipt printer. If set to 0, no slips are printed.</li>

<li><b>suggestion --</b> If set to 1, the Suggestions feature is activated in the OPAC. This feature allows OPAC users to suggest book purchases. When a suggestion is made in the OPAC, it is assigned the status "ASKED." A librarian then manages the suggestion and can set the status to "REJECTED" or "ORDERED." When a book is ordered and has arrived in the library, the status becomes "AVAILABLE." Suggestions that are not yet "AVAILABLE" are visible to all users of the OPAC.</li>

<li><b>template --</b> Preference order for screen templates. Koha comes with several different options for templates that control the look and feel of your Koha screens, and you can also write your own templates.</li>

<li><b>timeout --</b> Inactivity timeout period (in seconds). If a workstation is idle for longer than this period, the user will have to login again.</li>

<li><b>virtualshelves --</b> Set virtual shelves management on or off ("1" or "0"). Users can set up and manage their own "virtual bookshelves" of favorite library items if this feature is turned on.</li></ul>
<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: System Preferences -- Z39.50 servers administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Z39.50 servers administration</h1>
<p>Defines the Z39.50 servers you want Koha to search.</p>

<p>Koha comes with one Z39.50 server site defined (the U.S. Library of Congress) for finding catalog records to import directly into your catalog. In this area, you can define other servers for searching.</p>

<p>To add servers, you will need to know the domain name or IP address of the server, the port number to use, and the name of the database to access. This information is available for many servers worldwide by acessing the Index Data website at http://www.indexdata.dk/targettest/. All of the servers listed there accept anonymous connections. (Be sure to choose servers which deliver records in the proper MARC format for your Koha installation.)</p>

<p>If you have a login name and password for other Z39.50 servers, Koha will save your user ID and password in addition to the other information it needs to make a connection. (For anonymous servers, leave the userid and password fields blank.) The other fields on the form control whether or not the server is automatically searched when you request a Z39.50 search (put a "1" in the "Checked" field) and the order in which it is checked.</p>

<p>It is a good idea to be selective in choosing servers. Defining more than five or six checked servers may slow down your Z39.50 search results, even if they are queried all together.</p>

<p>IMPORTANT NOTE : the z3950search will NOT work until your system administrator has not activated the z3950 client daemon on your server. The daemon is in KohaDirectory/script/z3950daemon. It should be added to rc.d to be launched during server boot.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/members memberentry.tmpl,NONE,1.1.2.1 members-home.tmpl,NONE,1.1.2.1 moremember.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTar-0008Lc-Qa@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/members

Added Files:
      Tag: rel_2_2
	memberentry.tmpl members-home.tmpl moremember.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Adding a New Patron<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Add member help</h1>
<h2>Add Member, person</h2>
<p>This is the form for adding a new single member to the database. There is also a form for organisations, such as other libraries and non profit organisations you might lend to. You should use the Add Organisation tab at the top of the Member page for that.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>

<h2>Add Member, Institutional</h2>
<p>This is the form for adding a group of members. Suppose you had a YMCA group, or lend books to other Libraries. This would be the form to use for that purpose.</p>
<p>Every field with an asterisk must be filled out, or you will get an error, and the record will not be added to the database.</p>
<p>If you accidentally have two members with the same card number, the second duplicate will show up as just commas after you confirm the record.</p>
<p>When you are done with the record, click the Save button at the bottom.</p>
<p>The clear all Fields button will reset the page to a blank form in case you made a mistake.</p>
<p>You can always come back and edit what you enter in the Add Member screen by searching for the borrower by using their last name or card number, selecting a user by clicking on the entry in the search list, and then clicking the Modify button on the member information screen.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Members<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Members help</h1>
<p>This is the Members portion of Koha.</p>
<p>The Members portion stores the information you add about your patrons.</p>
<p>To add a patron, type their name into the search box on the left, and
click the OK button.</p>
<p>If there is already a borrower matching the name you searched, it will show
after you click OK. This can be particularly useful when people have lost
their cards or when children forget their cards. That way, you can avoid having
multiple numbers for the same patron.</p>
<p>Alternatively, you can browse a section of borrowers by selecting the first
letter of the Patron's last name from the list on the right.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Online Help: Member Information<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<div id="main-compact">
<h1>Member Information Screen</h1>
<p>This screen shows the information associated with a given patron.</p>
<p>On the top left is their address and card number.</p>
<p>A patron's annual membership fee payment status also shows on this screen.</p>
<p>Any fines a patron has will show up in the top middle of this screen.</p>
<p>Any materials a patron has requested will show up on the top right of this screen.</p>
<p>You can get information on what a patron has read in the past by clicking on the Reading Record button.</p>
<p>Any items a patron currently has out will show up under "Items currently on issue".</p>
<p>If you would like to edit a patron's information, click the modify button on the lower left.</p>
<p>If you would like to PERMANENTLY delete a user, click the delete button on the lower left. A confirmation box will
appear, so don't worry about accidentally deleting a record. Just be absolutely sure before you delete!</p>
<p>The change password button allows a user to either set a new password or change their current password. This is useful to patrons that wish to place reserves online from home. You cannot see a password again once you change it, but you can reset a password.</p>
<p>Modify user flags allows an administrator to set which clerks, librarians, patrons, technical support people or trustees have access to certain parts of the database. Right now, one can either have permission to access everything on the Intranet side, or just have access to the OPAC.</p>

<!-- TMPL_INCLUDE name="help-bottom.inc" -->



From oleonard at users.sourceforge.net  Fri Jan 14 16:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 07:42:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities authorities.tmpl,NONE,1.1.2.1
Message-ID: <E1CpTav-0008LM-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/help/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32048/koha-tmpl/intranet-tmpl/npl/en/help/authorities

Added Files:
      Tag: rel_2_2
	authorities.tmpl 
Log Message:
Synching with default template

--- NEW FILE ---
authority help



From oleonard at users.sourceforge.net  Fri Jan 14 22:08:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.3 newimember.tmpl,1.1,1.2 newjmember.tmpl,1.1,1.2 newmember.tmpl,1.1,1.2
Message-ID: <E1CpYg8-000216-Rd@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7721/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	14 Jan 2005 21:08:16 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	14 Jan 2005 21:08:16 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:08:48 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:08:48 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.4 acquire.tmpl,1.1,1.2 basket.tmpl,1.2,1.3 newbasket2.tmpl,1.1,1.2 order.tmpl,1.2,1.3 recieve.tmpl,1.1,1.2 recieveorder.tmpl,1.1,1.2 supplier.tmpl,1.1,1.2
Message-ID: <E1CpYga-000236-8R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7842/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	14 Jan 2005 21:08:45 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	14 Jan 2005 21:08:45 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	14 Jan 2005 21:08:45 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:09:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:09:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.3
Message-ID: <E1CpYh4-00025c-3x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8006/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
	marcimport.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	14 Jan 2005 21:09:09 -0000	1.3
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:10:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:10:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CpYhs-0002Bf-To@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
	addbookbybiblionumber.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:44:09 -0000	1.1
--- addbookbybiblionumber.tmpl	14 Jan 2005 21:10:04 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Fri Jan 14 22:16:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:16:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.3,1.4 search.tmpl,1.2,1.3 searchresultlist.tmpl,1.1,1.2 subscription-bib-search.tmpl,1.1,1.2
Message-ID: <E1CpYnq-0002XY-Lh@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9754/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** result.tmpl	11 Jan 2005 16:54:14 -0000	1.3
--- result.tmpl	14 Jan 2005 21:16:14 -0000	1.4
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tmpl	10 Jan 2005 17:02:54 -0000	1.2
--- search.tmpl	14 Jan 2005 21:16:14 -0000	1.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	14 Jan 2005 21:16:14 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Fri Jan 14 22:17:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:17:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.3
Message-ID: <E1CpYp6-0002ba-Vl@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9984/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	branchtransfers.tmpl 
Log Message:
Converting popup links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	14 Jan 2005 21:17:33 -0000	1.3
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Fri Jan 14 22:19:19 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:19:19 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.3 doc-head-close-addbiblio.inc,1.1,1.2 doc-head-close.inc,1.1,1.2
Message-ID: <E1CpYql-0002im-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10440/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	14 Jan 2005 21:19:15 -0000	1.3
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	14 Jan 2005 21:19:15 -0000	1.2
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Fri Jan 14 22:23:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:23:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes main-top.inc,1.3,NONE
Message-ID: <E1CpYuS-0002vL-7T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11232/koha-tmpl/intranet-tmpl/npl/en/includes

Removed Files:
	main-top.inc 
Log Message:
Removing main-top.inc.  Other includes are used in its place (doc-head-open.inc and doc-head-close.inc)

--- main-top.inc DELETED ---




From oleonard at users.sourceforge.net  Fri Jan 14 22:33:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:33:16 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.2
Message-ID: <E1CpZ4G-0003Pp-AL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13110/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categoryitem.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	14 Jan 2005 21:33:12 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Fri Jan 14 22:34:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 14 Jan 2005 13:34:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.2 modbib.tmpl,1.1,1.2 modbibitem.tmpl,1.1,1.2 updatebiblio.tmpl,1.1,1.2
Message-ID: <E1CpZ5d-0003UY-FH@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13394/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	14 Jan 2005 21:34:37 -0000	1.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From acli at users.sourceforge.net  Sat Jan 15 06:51:37 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Fri, 14 Jan 2005 21:51:37 -0800
Subject: [Koha-cvs] CVS: koha/misc buildrelease,1.23,1.23.2.1
Message-ID: <E1CpgqX-0002h0-P4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9389

Modified Files:
      Tag: rel_2_2
	buildrelease 
Log Message:
Taught buildrelease what the misc directory and release 2.2 is, and also
that version numbers might only have 1 dot. This should fix bugs 889, 890.

A --verbose or -v option has been added in the process of doing the above.

It now chdir to .. if it discovers that it is being run inside misc, since
running it inside misc screws up various things, and I never remember
whether it should be run inside misc or not.

A confirmation message about whether to tag or not is now displayed after
the user answers the question about tagging. I have never felt safe not
having the release builder confirm with me that I really am not tagging
anything.


Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -r1.23 -r1.23.2.1
*** buildrelease	5 Jan 2005 14:31:06 -0000	1.23
--- buildrelease	15 Jan 2005 05:51:35 -0000	1.23.2.1
***************
*** 1,4 ****
--- 1,60 ----
  #!/usr/bin/perl
+ # This script uses standard 8-space tabs with 4-space indents
+ # vi users can :set sw=4 ai sm
  
+ use Getopt::Long;
+ use vars qw( $verbose_p );
+ 
+ GetOptions(
+     'verbose|v' => \$verbose_p,
+ ) || exit(1);
+ 
+ print <<EOM;
+ ***************************************
+ * Welcome to the Koha Release Builder *
+ ***************************************
+ EOM
+ 
+ #----------------------------------------------------------
+ # To guess the version, we need to first guess where this
+ # script itself is Otherwise we will have different results
+ # depending on whether the script is called as ./buildrelease
+ # or misc/buildrelease. If we run the script from misc, we
+ # will also get errors from "cvs update" later, so this is
+ # rather important information
+ #----------------------------------------------------------
+ print STDERR "Perl reports that buildrelease is $0\n" if $verbose_p;
+ my $self_path;
+ if ($0 =~ /^(\.\/)*buildrelease$/) {
+     $self_path = 'buildrelease';
+ } elsif ($0 =~ /^(?:(\.\/)*\/)?misc\/buildrelease$/) {
+     $self_path = 'misc/buildrelease';
+ } else {
+     print <<EOM;
+ 
+ WARNING: Unable to determine where the buildrelease script is located.
+          The version number guessed by the next step might be wrong.
+ EOM
+     $self_path = (-f 'buildrelease')? 'buildrelease': 'misc/buildrelease';
+ }
+ print STDERR "Assuming buildrelease is $self_path\n" if $verbose_p;
+ 
+ #----------------------------------------------------------
+ # Fixup the current directory
+ #----------------------------------------------------------
+ if ($self_path eq 'buildrelease') {
+     print <<EOM;
+ 
+ WARNING: You should run the buildrelease script from the top of the koha
+          CVS module.  I will try to change to the correct directory, but
+          it is better if you had ran this script there in the first place.
+ EOM
+     chdir ".." || die "..: chdir: $!\n";
+     $self_path = 'misc/buildrelease';
+ }
+ 
+ #----------------------------------------------------------
+ # Start the release builder
+ #----------------------------------------------------------
  #sub guess_kohahtmldir ($;$);
  #----------------------------------------------------------
***************
*** 14,17 ****
--- 70,74 ----
  
  if (-e "$roothomedir/.kohaautobuild.conf") {
+     print STDERR "$roothomedir/.kohaautobuild.conf found\n" if $verbose_p;
      open C, "<$roothomedir/.kohaautobuild.conf";
      while (<C>) {
***************
*** 30,37 ****
  
  print qq |
- ***************************************
- * Welcome to the Koha Release Builder *
- ***************************************
- 
  This script will automatically build a release tarball.
  
--- 87,90 ----
***************
*** 39,45 ****
  out for the release that you want to build, although it will update the modules
  before building.
- 
  |;
! print "\nWhere is the 'koha' cvs module located [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
--- 92,97 ----
  out for the release that you want to build, although it will update the modules
  before building.
  |;
! print "\nWhere is the 'koha' cvs module located? [$kohadir]: ";
  chomp($input = <STDIN>);
  if ($input) {
***************
*** 62,72 ****
  #kohahtmldir=$kohahtmldir
  |;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print "\n\nGuessing at next release version.  You may need to enter your SourceForge password...\n";
  chdir $kohadir;
! open (CVSLOG, "cvs log misc/buildrelease|");
  my $symbolicnamessection=0;
  my $symbolicnames;
--- 114,128 ----
  #kohahtmldir=$kohahtmldir
  |;
+ print STDERR "$roothomedir/.kohaautobuild.conf written\n" if $verbose_p;
  
  #----------------------------------------------------------
  # which VERSION are we building ?
  #----------------------------------------------------------
! print <<EOM;
! 
! Guessing the next release version. You may need to enter your SourceForge password.
! EOM
  chdir $kohadir;
! open (CVSLOG, "cvs log $self_path|");
  my $symbolicnamessection=0;
  my $symbolicnames;
***************
*** 79,97 ****
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/R_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id=~s/-/\./g;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 135,156 ----
      if (/^symbolic names:/) {
  	$symbolicnamessection=1;
+ 	print STDERR "Scanning symbolic names from cvs output\n" if $verbose_p;
      }
      if ($symbolicnamessection && (/^\s+([^:]*):/)) {
  	my $tag=$1;
! 	if ($tag=~/(?:R|rel)_(.*)/) {
  	    my $version='';
  	    my $rc=0;
  	    my $id=$1;
! 	    $id =~ s/[-_]/\./g;
! 	    print STDERR "Found a tag for release $id\n" if $verbose_p;
  	    if ($id =~/(.*)RC(.*)/) {
  		$version=$1;
  		$rc=$2;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=$rc;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 99,109 ****
  		    $released=0;
  		    $highestrc=$rc;
  		}
  	    } else {
  		$version=$id;
! 		$version=~m#(\d+\.\d+)\.#;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
  		}
  		if (versioncompare($version, $highestversion)) {
--- 158,170 ----
  		    $released=0;
  		    $highestrc=$rc;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    } else {
  		$version=$id;
! 		$version =~ /^(\d+\.\d+)(?:\.|[RC]|$)/;
  		if (versioncompare($version, $majorversion->{$1})) {
  		    $majorversion->{$1}=$version;
  		    $majorversionrc->{$1}=0;
+ 		    print STDERR "Setting major version for $1 to $version $rc\n" if $verbose_p;
  		}
  		if (versioncompare($version, $highestversion)) {
***************
*** 111,117 ****
--- 172,180 ----
  		    $released=1;
  		    $highestrc=0;
+ 		    print STDERR "Setting highest version to $highestversion $highestrc\n" if $verbose_p;
  		}
  	    }
  	    $symbolicnames->{$version}->{$rc}=1;
+ 	    print STDERR "Setting symbolic name mapping for version $version $rc to 1\n" if $verbose_p;
  	}
      }
***************
*** 121,143 ****
  my $currentversion='';
  
! my $branchdata=`grep buildrelease CVS/Entries`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! 
! if ($branch eq 'Trel-1-2') {
!     $highestversion=$majorversion->{'1.2'};
!     $highestrc=$majorversionrc->{'1.2'};
      ($highestrc) ? ($released=0) : ($released=1);
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     $components[$#components]++;
!     $nexthighestversion=join '.', @components;
!     my $minornumber=(split(/\./, $highestversion))[1];
!     if ($minornumber/2 == int($minornumber/2)) {
! 	$releaseversion=$nexthighestversion."RC1";
      } else {
! 	$releaseversion=$nexthighestversion;
      }
      $currentversion=$highestversion;
--- 184,219 ----
  my $currentversion='';
  
! my $cvs_entries_path = $self_path;
! $cvs_entries_path =~ s/[^\/]+$/CVS\/Entries/;
! print STDERR "Assuming CVS/Entries is $cvs_entries_path\n" if $verbose_p;
! 
! my $branchdata=`grep buildrelease $cvs_entries_path`;
  chomp $branchdata;
  my $branch=(split(m#/#, $branchdata))[5];
! $branch =~ s/^T//;
! $branch =~ s/^(?:R|rel)_//;
! $branch =~ s/[-_]/./g;
! print STDERR "Detected branch $branch\n" if $verbose_p;
! 
! if ($branch =~ /\S/ && defined $majorversion->{$branch}) {
!     $highestversion=$majorversion->{$branch};
!     $highestrc=$majorversionrc->{$branch};
      ($highestrc) ? ($released=0) : ($released=1);
+     print STDERR "Using highest version for branch $branch\n" if $verbose_p;
  }
  
  if ($released) {
      my @components=split(/\./, $highestversion);
!     if (@components < 3) { # if it's something like just 2.2 or 2.4
! 	$releaseversion = $highestversion.".1RC1";
      } else {
! 	$components[$#components]++;
! 	$nexthighestversion=join '.', @components;
! 	my $minornumber=(split(/\./, $highestversion))[1];
! 	if ($minornumber/2 == int($minornumber/2)) {
! 	    $releaseversion=$nexthighestversion."RC1";
! 	} else {
! 	    $releaseversion=$nexthighestversion;
! 	}
      }
      $currentversion=$highestversion;
***************
*** 155,159 ****
      print "\nWould you like to rebuild the $currentversion tarball?  Y/[N]: ";
      chomp($input = <STDIN>);
-     print STDERR "releaseversion=($releaseversion), currentversion=($currentversion)\n";#XXXZZZ
      if ($input =~ /^y/i) {
  	$releaseversion=$currentversion;
--- 231,234 ----
***************
*** 178,185 ****
  chomp ($input=<STDIN>);
  my $cvstag=0;
- # FIXME: This means anything other than n will tag; too dangerous?
  if ($input=~/^y/i) {
      $cvstag=1;
  }
  
  
--- 253,260 ----
  chomp ($input=<STDIN>);
  my $cvstag=0;
  if ($input=~/^y/i) {
      $cvstag=1;
  }
+ print "The CVS repository ",($cvstag?"WILL BE TAGGED\n":"will not be tagged\n");
  
  
***************
*** 329,332 ****
--- 404,408 ----
  
  
+ # Given two version numbers (v1, v2), returns 0 if v1 <= v2, or 1 if v1 > v2
  sub versioncompare {
      my $v1=shift;




From oleonard at users.sourceforge.net  Tue Jan 18 18:35:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 09:35:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-auth.tmpl,1.1,1.1.2.1 opac-main.tmpl,1.3,1.3.2.1
Message-ID: <E1CqxGp-0007Jf-Or@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28083/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-auth.tmpl opac-main.tmpl 
Log Message:
Removing NPL-specific javascript function which was trying to validate library card numbers

Index: opac-auth.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-auth.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-auth.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-auth.tmpl	18 Jan 2005 17:35:51 -0000	1.1.2.1
***************
*** 35,39 ****
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid" onblur="ValidateCode();"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>
--- 35,39 ----
  <div class="form">
  <table>
! <tr><th><label for="userid">Your card number</label></th><td><input type="text"  size="25" id="userid"  name="userid"></td>
  <tr><th><label for="password">Password or PIN</label></th><td><input type="password"  size="25" id="password"  name="password"></td>
  </table>

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-main.tmpl	8 Dec 2004 16:12:17 -0000	1.3
--- opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
***************
*** 12,16 ****
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" onblur="ValidateCode();" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>
--- 12,16 ----
  <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
  <h3>Log in to Check Your Account</h3>
! <p><label for="userid">Card Number:</label> <input type="text" id="userid" size="10" name="userid" /></p>
  <p><label for="password">Password:</label> <input type="password" id="password" size="10" name="password" /></p>
  <p><input type="submit" value="Log In" class="submit" /></p>




From oleonard at users.sourceforge.net  Tue Jan 18 21:09:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 12:09:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.4,1.5
Message-ID: <E1Cqzfh-0007io-9K@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29568/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** request.tmpl	13 Jan 2005 21:53:03 -0000	1.4
--- request.tmpl	18 Jan 2005 20:09:28 -0000	1.5
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:10:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:10:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/includes doc-head-circ-close.inc,1.2,1.2.2.1 doc-head-close-addbiblio.inc,1.1,1.1.2.1 doc-head-close.inc,1.1,1.1.2.1
Message-ID: <E1Cr0cs-0002XC-Qu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9555/koha-tmpl/intranet-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	doc-head-circ-close.inc doc-head-close-addbiblio.inc 
	doc-head-close.inc 
Log Message:
Enabling popup function in javascript (previously disabled to prevent popups)

Index: doc-head-circ-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-circ-close.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** doc-head-circ-close.inc	13 Apr 2004 16:57:24 -0000	1.2
--- doc-head-circ-close.inc	18 Jan 2005 21:10:15 -0000	1.2.2.1
***************
*** 8,14 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 8,13 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close-addbiblio.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-addbiblio.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close-addbiblio.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close-addbiblio.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   

Index: doc-head-close.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close.inc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** doc-head-close.inc	13 Apr 2004 16:57:24 -0000	1.1
--- doc-head-close.inc	18 Jan 2005 21:10:24 -0000	1.1.2.1
***************
*** 9,15 ****
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! // newwin =
! // window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
! 	location.href = targeturl;
  }
   
--- 9,14 ----
  <!-- Hide from old browsers
  function openWindow(targeturl, windowname) {
! 	newwin =
! 	window.open(targeturl,windowname,"height=480,width=640,scrollbars,resizable")
  }
   




From oleonard at users.sourceforge.net  Tue Jan 18 22:16:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:16:30 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en request.tmpl,1.3,1.3.2.1
Message-ID: <E1Cr0iE-0002lc-O0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10542/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	request.tmpl 
Log Message:
Converting popup links to normal links

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
--- request.tmpl	18 Jan 2005 21:16:24 -0000	1.3.2.1
***************
*** 24,32 ****
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
  </div>
--- 24,32 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th><label for="notes">Notes</label></th><td><input type="text" size="20" name="notes" id="notes"></tr><!-- /Hide from NPL -->
! 		<tr><th><label for="date">Date</label></th><td><!-- TMPL_VAR name="date" --></td></tr>
! 		<tr><th><label for="pickup">Pickup</label></th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th><label for="request">Request</label></th><td><input type="checkbox" name="request" id="request" value="any">Next Available, (or choose from list below)</tr>
! 		<tr><th><label for="member">Card Number</label> <a href="/cgi-bin/koha/members/members-home.pl?quicksearch=1" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" id="member" /></td></tr>
  	</table>
  </div>
***************
*** 130,134 ****
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>
--- 130,134 ----
  <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
! 					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra">
  						<!-- TMPL_VAR Name="barcode" -->
  					</a>




From oleonard at users.sourceforge.net  Tue Jan 18 22:22:07 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:22:07 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en bookcount.tmpl,1.1,1.1.2.1 modbib.tmpl,1.1,1.1.2.1 modbibitem.tmpl,1.1,1.1.2.1 updatebiblio.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr0nf-000345-OM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11617/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	bookcount.tmpl modbib.tmpl modbibitem.tmpl updatebiblio.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: bookcount.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookcount.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** bookcount.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- bookcount.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Circulation Statistics for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbib.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbib.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbib.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbib.tmpl	18 Jan 2005 21:21:23 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Record for <!-- TMPL_VAR Name="title" ESCAPE="HTML" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: modbibitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/modbibitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** modbibitem.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- modbibitem.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Edit Biblioitem for <!-- TMPL_VAR Name="title" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: updatebiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/updatebiblio.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** updatebiblio.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- updatebiblio.tmpl	18 Jan 2005 21:21:28 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Update Biblio<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:38:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:38:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bull result.tmpl,1.1.2.2,1.1.2.3 search.tmpl,1.1.2.1,1.1.2.2 searchresultlist.tmpl,1.1,1.1.2.1 subscription-bib-search.tmpl,1.1,1.1.2.1
Message-ID: <E1Cr13x-0003si-LN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14728/koha-tmpl/intranet-tmpl/npl/en/bull

Modified Files:
      Tag: rel_2_2
	result.tmpl search.tmpl searchresultlist.tmpl 
	subscription-bib-search.tmpl 
Log Message:
Change to allow page-specific title in title tag

Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** result.tmpl	11 Jan 2005 16:53:39 -0000	1.1.2.2
--- result.tmpl	18 Jan 2005 21:38:04 -0000	1.1.2.3
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  	<h1>Search results</h1>

Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/search.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** search.tmpl	10 Jan 2005 17:05:03 -0000	1.1.2.1
--- search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div id="main-compact">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  

Index: searchresultlist.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/searchresultlist.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** searchresultlist.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- searchresultlist.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  	<h1>Authority search results</h1>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authority search results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  	<h1>Authority search results</h1>

Index: subscription-bib-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-bib-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** subscription-bib-search.tmpl	1 Nov 2004 22:52:53 -0000	1.1
--- subscription-bib-search.tmpl	18 Jan 2005 21:38:05 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <div>
  
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Bib Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div>
  




From oleonard at users.sourceforge.net  Tue Jan 18 22:55:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:55:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1Js-0004nJ-BT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18387/koha-tmpl/intranet-tmpl/npl/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">

<div class="table"><table>
  <tr>
  	<th>&nbsp;</th>
    <th>Card</th>
    <th>Name (Cat.)</th>
    <th>Address</th>
  </tr>
  <!-- TMPL_IF NAME="resultsloop" -->
  <!-- TMPL_LOOP NAME="resultsloop" -->
    <!-- TMPL_IF NAME="background" -->
    <tr class="highlight">
    <!-- TMPL_ELSE -->
    <tr>
    <!-- /TMPL_IF -->
	 <td><form action="member-search-results.pl" method="get"><input type="button" class="submit" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
    </tr>
  <!-- /TMPL_LOOP -->
  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
</table></div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

<div id="main-compact">
	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
	<input type="submit" value="Search" class="submit" />
	</form>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Tue Jan 18 22:57:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:57:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members member-quicksearch-results.tmpl,NONE,1.1.2.1 member-quicksearch.tmpl,NONE,1.1.2.1
Message-ID: <E1Cr1La-0004sQ-Oc@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18688/koha-tmpl/intranet-tmpl/default/en/members

Added Files:
      Tag: rel_2_2
	member-quicksearch-results.tmpl member-quicksearch.tmpl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="quicksearch-top.inc" -->

<div id="mainbloc">
<h1>Member Search</h1>

<div class="bloc100">
	<table>
		<tr>
			<th>&nbsp;</th>
			<th>Card</th>
			<th>Surname</th>
			<th>Firstname</th>
			<th>Address</th>
		</tr>
		<!-- TMPL_LOOP NAME="resultsloop" -->
			<!-- TMPL_IF NAME="background" -->
				<tr bgcolor="#ffffcc">
			<!-- TMPL_ELSE -->
				<tr bgcolor="white">
			<!-- /TMPL_IF -->
				<td><form action="member-search-results.pl" method="get"><input type="button" class="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','request','member'); return false;" /></form></td>
				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
				<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" --></a></td>
				<td><!-- TMPL_VAR NAME="firstname" --></a></td>
				<td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" --></td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>

<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
<div id="mainbloc">
<h1>Member Quick Search</h1>

<div id="bloc25">
<form action="/cgi-bin/koha/members/member.pl" method="post">
	<label for="member">Member name: </label>	<input type="text" size="50" name="member" id="member"><input type="hidden" name="quicksearch" value="1"> 	<input type="submit" class="button" value="OK">
	</div>
<!-- TMPL_INCLUDE NAME="popup-bottom.inc" -->




From oleonard at users.sourceforge.net  Tue Jan 18 22:59:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 13:59:16 -0800
Subject: [Koha-cvs] CVS: koha/members members-home.pl,1.1,1.1.2.1
Message-ID: <E1Cr1Nc-0004yv-Rw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19123/members

Modified Files:
      Tag: rel_2_2
	members-home.pl 
Log Message:
Adding member quick search (already in HEAD) to rel_2_2

Index: members-home.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/members-home.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** members-home.pl	10 Mar 2004 15:13:45 -0000	1.1
--- members-home.pl	18 Jan 2005 21:59:09 -0000	1.1.2.1
***************
*** 10,14 ****
  
  my $query = new CGI;
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
--- 10,28 ----
  
  my $query = new CGI;
! my $quicksearch = $query->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! my $template_name;
! 
! if($quicksearch){
! ($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
! 			     query => $query,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/members-home.tmpl",
  			     query => $query,
***************
*** 18,21 ****
--- 32,37 ----
  			     debug => 1,
  			     });
+ }
+ 
  
  output_html_with_http_headers $query, $cookie, $template->output;




From oleonard at users.sourceforge.net  Tue Jan 18 23:07:47 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:07:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes quicksearch-top.inc,NONE,1.1.2.1
Message-ID: <E1Cr1Vr-0005KP-5g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20451/koha-tmpl/intranet-tmpl/default/en/includes

Added Files:
      Tag: rel_2_2
	quicksearch-top.inc 
Log Message:
Header include for member-quicksearch-results.tmpl (includes javascript for communicating with parent window)

--- NEW FILE ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

<html>
<head>
<title>popup</title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">

<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/common-style.css">
<script language="javascript" type="text/javascript">
	// Set the value of the form field to the passed value and optionally shift
	// focus and close the popup.
	function FillForm(val,formname,formfield) {
		document.forms[formname].elements[formfield].value = val;
		// Uncomment below to shift focus after clicking link in popup.
		document.forms[formname].elements[formfield].focus();
		// Uncomment below to close popup after clicking link.
		newwin.close();
	}
</script>
</head>

<body>
<!-- NO MENUS for popup-top -->




From oleonard at users.sourceforge.net  Tue Jan 18 23:11:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:11:59 -0800
Subject: [Koha-cvs] CVS: koha/members member.pl,1.2,1.2.2.1
Message-ID: <E1Cr1Zv-0005Z4-DY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21337/members

Modified Files:
      Tag: rel_2_2
	member.pl 
Log Message:
Adding option to output using quicksearch template if the quicksearch parameter is present (uses member-quicksearch.tmpl and member-quicksearch-results.tmpl)

Index: member.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/member.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member.pl	5 Sep 2004 22:34:05 -0000	1.2
--- member.pl	18 Jan 2005 22:11:43 -0000	1.2.2.1
***************
*** 33,45 ****
  
  my $input = new CGI;
! 
! my $theme = $input->param('theme') || "default";
! 			# only used if allowthemeoverride is set
! #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
! 	# FIXME - Error-checking
! #my $template = HTML::Template->new( filename => $tmpldata{'path'},
! #				    die_on_bad_params => 0,
! #				    loop_context_vars => 1 );
! my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
--- 33,49 ----
  
  my $input = new CGI;
! my $quicksearch = $input->param('quicksearch');
! my ($template, $loggedinuser, $cookie);
! if($quicksearch){
! 	($template, $loggedinuser, $cookie)
!     = get_template_and_user({template_name => "members/member-quicksearch-results.tmpl",
! 			     query => $input,
! 			     type => "intranet",
! 			     authnotrequired => 0,
! 			     flagsrequired => {borrowers => 1},
! 			     debug => 1,
! 			     });
! } else {
! 	($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "members/member.tmpl",
  			     query => $input,
***************
*** 49,52 ****
--- 53,65 ----
  			     debug => 1,
  			     });
+ }
+ my $theme = $input->param('theme') || "default";
+ 			# only used if allowthemeoverride is set
+ #my %tmpldata = pathtotemplate ( template => 'member.tmpl', theme => $theme, language => 'fi' );
+ 	# FIXME - Error-checking
+ #my $template = HTML::Template->new( filename => $tmpldata{'path'},
+ #				    die_on_bad_params => 0,
+ #				    loop_context_vars => 1 );
+ 
  
  my $member=$input->param('member');




From oleonard at users.sourceforge.net  Tue Jan 18 23:53:08 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 18 Jan 2005 14:53:08 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1 auth_tag_structure.tmpl,NONE,1.1 authtypes.tmpl,NONE,1.1
Message-ID: <E1Cr2Dk-0007jK-Cf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29639/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From tipaul at users.sourceforge.net  Wed Jan 19 18:17:32 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:17:32 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_subfields_structure.pl,1.3,1.3.2.1 marc_subfields_structure.pl,1.32,1.32.2.1
Message-ID: <E1CrJSW-0006Sl-8e@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24771/admin

Modified Files:
      Tag: rel_2_2
	auth_subfields_structure.pl marc_subfields_structure.pl 
Log Message:
fix for #902 (it's impossible to set the subfield 400$0)

Index: auth_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** auth_subfields_structure.pl	10 Jun 2004 08:58:34 -0000	1.3
--- auth_subfields_structure.pl	19 Jan 2005 17:17:08 -0000	1.3.2.1
***************
*** 200,204 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 200,204 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
***************
*** 282,286 ****
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield;
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];
--- 282,286 ----
  		my $tagfield			=$input->param('tagfield');
  		my $tagsubfield		=$tagsubfield[$i];
! 		$tagsubfield="@" unless $tagsubfield ne '';
  		my $liblibrarian		=$liblibrarian[$i];
  		my $libopac			=$libopac[$i];




From tipaul at users.sourceforge.net  Wed Jan 19 18:24:20 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:24:20 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.22.2.1
Message-ID: <E1CrJZ6-0006s1-Uz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26371/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
removing 2 useless columns

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -r1.22 -r1.22.2.1
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
***************
*** 255,261 ****
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Upper Age Limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Age Required</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Fine</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Overdue</b></td>
- 				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Issue limit</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"><b>Reserve</b></td>
  				<td background="<!-- TMPL_VAR NAME="themelang" -->/images/background-mem.gif"> </td>
--- 255,259 ----
***************
*** 270,274 ****
  				<td><!-- TMPL_VAR NAME="upperagelimit" --></td>
  				<td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
- 				<td><!-- TMPL_VAR NAME="finetype" --></td>
  				<td><!-- TMPL_IF NAME="overduenoticerequired" -->
  						<i>Yes</i>
--- 268,271 ----
***************
*** 277,281 ****
  					<!-- /TMPL_IF -->
  				</td>
- 				<td><!-- TMPL_VAR NAME="issuelimit" --></td>
  				<td><!-- TMPL_VAR NAME="reservefee" --></td>
  				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
--- 274,277 ----




From tipaul at users.sourceforge.net  Wed Jan 19 18:32:47 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Wed, 19 Jan 2005 09:32:47 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters auth_tag_structure.tmpl,1.2,1.2.2.1
Message-ID: <E1CrJhH-0007I7-Vk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27964/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
in authority structure, trying to delete a tag in an authority type, deleted the tag in the default authority type.


Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.tmpl	19 Jul 2004 19:19:54 -0000	1.2
--- auth_tag_structure.tmpl	19 Jan 2005 17:32:31 -0000	1.2.2.1
***************
*** 89,92 ****
--- 89,93 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed">
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Wed Jan 19 18:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:40:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member.tmpl,1.4.2.1,1.4.2.2
Message-ID: <E1CrJov-0007fM-Iw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29449/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member.tmpl 
Log Message:
Fixing typo: nested TMPL_VAR tag that would cause internal server error

Index: member.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member.tmpl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** member.tmpl	10 Jan 2005 16:46:54 -0000	1.4.2.1
--- member.tmpl	19 Jan 2005 17:40:33 -0000	1.4.2.2
***************
*** 31,35 ****
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="<!-- TMPL_VAR NAME="borrowernumber" -->" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->
--- 31,35 ----
  <!--       <td><!-- TMPL_VAR NAME="fines" --></td> -->
        <td><div class="notes"><!-- TMPL_VAR NAME="borrowernotes" --></div></td>
! 	  <td><a href="/cgi-bin/koha/members/memberentry.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;modify=edit">Edit</a></td>
      </tr>
    <!-- /TMPL_LOOP -->




From oleonard at users.sourceforge.net  Wed Jan 19 18:44:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 09:44:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.1.2.1
Message-ID: <E1CrJsA-0007qn-Sw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30092/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Removing non-functional renew link

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
- <th>Status</th>
  </tr>
  
--- 86,89 ----
***************
*** 97,107 ****
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
- <td>
- <!-- TMPL_IF NAME="status" -->
- <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
- <!-- TMPL_ELSE -->
- Not renewable
- <!-- /TMPL_IF -->
- </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,99 ----




From oleonard at users.sourceforge.net  Wed Jan 19 22:18:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:18:10 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.15
Message-ID: <E1CrNDO-0001oA-GL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6934/opac

Modified Files:
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	19 Jan 2005 21:18:06 -0000	1.15
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Wed Jan 19 22:22:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:22:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1,1.2
Message-ID: <E1CrNH7-00026r-Ga@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8040/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-user.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-user.tmpl	19 Jan 2005 21:21:59 -0000	1.2
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,90 ****
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <th>Status</th>
  </tr>
  
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
! <!-- <th>Status</th> -->
  </tr>
  
***************
*** 92,101 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
--- 96,105 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
! <!-- <td>
  <!-- TMPL_IF NAME="status" -->
  <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
***************
*** 103,107 ****
  Not renewable
  <!-- /TMPL_IF -->
! </td>
  </tr>
  <!-- /TMPL_LOOP -->
--- 107,111 ----
  Not renewable
  <!-- /TMPL_IF -->
! </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 121,136 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
--- 125,144 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>




From oleonard at users.sourceforge.net  Wed Jan 19 22:39:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:39:28 -0800
Subject: [Koha-cvs] CVS: koha request.pl,1.28,1.29
Message-ID: <E1CrNY0-0003Rv-8l@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13177

Modified Files:
	request.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should display that information.

Index: request.pl
===================================================================
RCS file: /cvsroot/koha/koha/request.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** request.pl	13 Jul 2004 12:55:01 -0000	1.28
--- request.pl	19 Jan 2005 21:39:25 -0000	1.29
***************
*** 134,141 ****
--- 134,145 ----
  		my $item = $res->{'itemnumber'};
  		$item = getiteminformation(\%env,$item);
+ 		$reserve{'holdingbranch'}=$item->{'holdingbranch'};
  		$reserve{'barcode'}=$item->{'barcode'};
  		$reserve{'biblionumber'}=$item->{'biblionumber'};
  		$reserve{'wbrcode'} = $res->{'branchcode'};
  		$reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 		if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+ 			$reserve{'atdestination'} = 1;
+ 		}
      }
      $reserve{'date'} = format_date($res->{'reservedate'});




From oleonard at users.sourceforge.net  Wed Jan 19 22:45:59 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 19 Jan 2005 13:45:59 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en request.tmpl,1.17,1.18
Message-ID: <E1CrNeJ-0003ys-10@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15288/koha-tmpl/intranet-tmpl/default/en

Modified Files:
	request.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Otherwise waiting items will be shown as "in transit" between holding branch and destination branch.

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/request.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** request.tmpl	13 Jan 2005 22:41:03 -0000	1.17
--- request.tmpl	19 Jan 2005 21:45:56 -0000	1.18
***************
*** 109,113 ****
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 							Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">
--- 109,118 ----
  						<td><!-- TMPL_VAR NAME="date" --></td>
  						<td><!-- TMPL_IF Name="wait" -->
! 						<!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- /TMPL_IF -->
! 		<input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" -->>
  							<!-- TMPL_ELSE -->
  								<select name="pickup">




From tipaul at users.sourceforge.net  Thu Jan 20 16:06:35 2005
From: tipaul at users.sourceforge.net (Paul POULAIN)
Date: Thu, 20 Jan 2005 07:06:35 -0800
Subject: [Koha-cvs] CVS: koha/admin auth_tag_structure.pl,1.2,1.2.2.1
Message-ID: <E1CrdtL-0008Qq-3o@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32360/admin

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.pl 
Log Message:
deleting tags for the requested framework only.

Index: auth_tag_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** auth_tag_structure.pl	10 Jun 2004 08:58:34 -0000	1.2
--- auth_tag_structure.pl	20 Jan 2005 15:06:31 -0000	1.2.2.1
***************
*** 174,177 ****
--- 174,178 ----
  	$template->param(liblibrarian => $data->{'liblibrarian'},
  							searchfield => $searchfield,
+ 							authtypecode => $authtypecode,
  							);
  													# END $OP eq DELETE_CONFIRM
***************
*** 180,185 ****
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield'");
  	}
  													# END $OP eq DELETE_CONFIRMED
--- 181,186 ----
  } elsif ($op eq 'delete_confirmed') {
  	unless (C4::Context->config('demo') eq 1) {
! 		$dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
! 		$dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
  	}
  													# END $OP eq DELETE_CONFIRMED




From oleonard at users.sourceforge.net  Thu Jan 20 18:34:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:34:32 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.3.2.1
Message-ID: <E1CrgCW-00025w-O8@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8017/admin

Modified Files:
      Tag: rel_2_2
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:34:30 -0000	1.3.2.1
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:36:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:36:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.3.2.1
Message-ID: <E1CrgED-0002Fa-Vi@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8610/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:36:15 -0000	1.3.2.1
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:37:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:37:58 -0800
Subject: [Koha-cvs] CVS: koha/admin issuingrules.pl,1.3,1.4
Message-ID: <E1CrgFq-0002Mg-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9072/admin

Modified Files:
	issuingrules.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: issuingrules.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/issuingrules.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.pl	18 Aug 2004 16:05:14 -0000	1.3
--- issuingrules.pl	20 Jan 2005 17:37:56 -0000	1.4
***************
*** 132,136 ****
  $sth->execute;
  # $i=0;
! my $toggle="white";
  my @row_loop;
  my @itemtypes;
--- 132,136 ----
  $sth->execute;
  # $i=0;
! my $toggle= 1;
  my @row_loop;
  my @itemtypes;
***************
*** 146,153 ****
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 'white' ) {
! 		$toggle = '#ffffcc';
  	} else {
! 		$toggle = 'white';
  	}
  	for (my $i=0;$i<=$#trow3;$i++){
--- 146,153 ----
  	my @trow2;
  	my @cell_loop;
! 	if ( $toggle eq 1 ) {
! 		$toggle = 0;
  	} else {
! 		$toggle = 1;
  	}
  	for (my $i=0;$i<=$#trow3;$i++){




From oleonard at users.sourceforge.net  Thu Jan 20 18:38:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:38:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters issuingrules.tmpl,1.3,1.4
Message-ID: <E1CrgGA-0002P6-IV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9222/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	issuingrules.tmpl 
Log Message:
Altering table cell color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: issuingrules.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** issuingrules.tmpl	19 Jul 2004 19:20:29 -0000	1.3
--- issuingrules.tmpl	20 Jan 2005 17:38:16 -0000	1.4
***************
*** 46,50 ****
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">
--- 46,50 ----
  					</th>
  					<!-- TMPL_LOOP NAME="cell" -->
! 						<td<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10"> /
  							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10">




From oleonard at users.sourceforge.net  Thu Jan 20 18:39:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:39:41 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters biblio_framework.tmpl,NONE,1.1 issuingrules.tmpl,NONE,1.1
Message-ID: <E1CrgHV-0002VQ-Kf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9613/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
	biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 18:41:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 09:41:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_subfields_structure.tmpl,NONE,1.1.2.1 auth_tag_structure.tmpl,NONE,1.1.2.1 authtypes.tmpl,NONE,1.1.2.1 biblio_framework.tmpl,NONE,1.1.2.1 issuingrules.tmpl,NONE,1.1.2.1
Message-ID: <E1CrgIv-0002bx-2r@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9964/koha-tmpl/intranet-tmpl/npl/en/parameters

Added Files:
      Tag: rel_2_2
	auth_subfields_structure.tmpl auth_tag_structure.tmpl 
	authtypes.tmpl biblio_framework.tmpl issuingrules.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<input type="hidden" name="op" value="add_validate" />
	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
	<table>
	<!-- TMPL_LOOP NAME="loop" -->
		<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td>
			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
			<h3>MARC constraints</h3>
			<p>
				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
				<!-- TMPL_VAR NAME="mandatory" --> mandatory
			</p>
			<p>
				
				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
			</p>
			<h3>Editor constaints</h3>
			<p> 
				<label>Text for librarian</label>
				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
			</p>
			<p>
				
				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
			</p>
			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
			<p>
				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
			</p>
		</td>
		</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<input type="submit" value="OK" class="button parameters">
	<p>Note: in the last column, you can choose:
	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
	</ul>
	</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->

<div id="bloc25">
	<h2>
		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
		<!-- TMPL_VAR NAME="liblibrarian" -->
	</h2>
	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p>CONFIRM DELETION</p>
		<input type="submit" value="YES" class="submit" />
	</form>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
		<input type="submit" value="NO" class="submit" />
	</form>
</div>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>

<table>
<tr>
	<th>Subfield</th>
	<th>Text</th>
	<th>Constraints</th>
	<th>Delete</th>
<!-- TMPL_LOOP NAME="loop" -->
<tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
		<!-- TMPL_ELSE -->
			<!-- TMPL_VAR NAME="liblibrarian" -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<!-- TMPL_IF NAME="subfield_ignored" -->
			<i>subfield ignored</i>
		<!-- TMPL_ELSE -->
			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
		<!-- /TMPL_IF -->
	</td>
	<td>
		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
	</td>
</tr>
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_VAR NAME="edit" -->Edit</a>
<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
</a>
<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="next" -->
	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->

</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
<script language="javascript" type="text/javascript">
	function _(s) { return s } // dummy function for gettext
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNotNull(f,noalert) {
		if (f.value.length ==0) {
   return false;
		}
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function toUC(f) {
		var x=f.value.toUpperCase();
		f.value=x;
		return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isNum(v,maybenull) {
	var n = new Number(v.value);
	if (isNaN(n)) {
		return false;
		}
	if (maybenull==0 && v.value=='') {
		return false;
	}
	return true;
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function isDate(f) {
		var t = Date.parse(f.value);
		if (isNaN(t)) {
			return false;
		}
	}
	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
	function Check(f) {
		var ok=1;
		var _alertString="";
		var alertString2;
		if (f.tagfield.value.length==0) {
			_alertString += "\n- " + _("tag number missing");
		}
		if (_alertString.length==0) {
			document.Aform.submit();
		} else {
			alertString2  = _("Form not submitted because of the following problem(s)");
			alertString2 += "\n------------------------------------------------------------------------------------\n";
			alertString2 += _alertString;
			alert(alertString2);
		}
	}
	</script>

<!-- TMPL_IF NAME="add_form" -->

	<h1>
	<!-- TMPL_IF NAME="use-heading-flags-p" -->
	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
	</h1>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
		<p><label>&nbsp;</label><input type="button" value="OK" class="button" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="delete_confirm" -->

<table>
	<tr>
		<td>tag</td>
		<td><!-- TMPL_VAR NAME="searchfield" --></td>
	</tr>
	<tr>
		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
	</tr>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="delete_confirmed" />
		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" class="submit" /></form></td></tr>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirmed" -->

	Data deleted
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="authtype_create" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="authtype_create_confirm" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
		<select name="existingauthtypecode">
			<option value="">Default</option>
		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
		<!-- /TMPL_LOOP -->
		</select>
		<input type="submit" value="OK" class="submit" />
	</form>
<!-- /TMPL_IF -->


<!-- TMPL_IF NAME="else" -->
<div id="bloc25">
<h2>Select an authority framework</h2>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<select name="authtypecode">
		<option value="">Default</option>
	<!-- TMPL_LOOP NAME="authtypeloop" -->
		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
			<!-- TMPL_VAR NAME="authtypetext" -->
		</option>
	<!-- /TMPL_LOOP -->
	</select>
	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
	<input type="submit" value="OK" class="submit" />
</form>
</div>
<div id="bloc100">
	<table>
	<tr>
		<th>Tag</th>
		<th>Lib</th>
		<th>Repeatable</th>
		<th>Mandatory</th>
		<th>Authorised<br />value</th>
		<th>Subfields</th>
		<th>Edit</th>
		<th>Delete</th>
	<!-- TMPL_LOOP NAME="loop" -->
	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
	</tr>
	<!-- /TMPL_LOOP -->
	</table>
	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
		<input type="hidden" name="op" value="add_form" />
		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
		<input type="hidden" name="op" value="add_form" />
		<input type="submit" class="submit" value="Add Tag" />
		<!-- TMPL_IF NAME="isprevpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
		<!-- /TMPL_IF -->
		<!-- TMPL_IF NAME="nextpage" -->
			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
		<!-- /TMPL_IF -->
	</form>
</div>
<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.authtypecode.value.length==0) {
		_alertString += "\n- " + _("Authority type : code missing");
	}
	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->

	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
	<table>
		<!-- TMPL_IF NAME="authtypecode" -->
		<caption>Modify authority type</caption>
	<!-- TMPL_ELSE -->
		<caption>Add authority type</caption>
	<!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="authtypecode" -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
			<!-- TMPL_ELSE -->
				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
			<!-- /TMPL_IF -->
		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
	<p><input type="submit" value="OK" class="submit" onclick="Check(this.form); return false;" />
			</p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<div>
	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
	<!-- TMPL_IF NAME="total" -->
		<p>
			<b>This record is used <!-- TMPL_VAR NAME="total" --> times</b>
		</p>
	<!-- /TMPL_IF -->
	<p>CONFIRM DELETION</p>
	<p>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="hidden" name="op" value="delete_confirmed" />
			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
			<input type="submit" value="YES" class="submit" />
		</form>
		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
			<input type="submit" value="NO" class="submit" />
		</form>
	</p>
</div>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Auth type Admin</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>summary</th>
		<th>Tag reported</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
		<td><a href="auth_tag_structure.pl">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
			<td><!-- TMPL_VAR NAME="summary" --></td>
			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<script language="javascript" type="text/javascript">
function _(s) { return s } // dummy function for gettext
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNotNull(f,noalert) {
	if (f.value.length ==0) {
		return false;
	}
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function toUC(f) {
	var x=f.value.toUpperCase();
	f.value=x;
	return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isNum(v,maybenull) {
var n = new Number(v.value);
if (isNaN(n)) {
	return false;
	}
if (maybenull==0 && v.value=='') {
	return false;
}
return true;
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function isDate(f) {
	var t = Date.parse(f.value);
	if (isNaN(t)) {
		return false;
	}
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function Check(f) {
	var ok=1;
	var _alertString="";
	var alertString2;
	if (f.frameworkcode.value.length==0) {
		_alertString += "\n- " + _("Framework code missing");
	}
	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
		_alertString += "\n- " + _("Description missing");
	}
	if (_alertString.length==0) {
		document.Aform.submit();
	} else {
		alertString2  = _("Form not submitted because of the following problem(s)");
		alertString2 += "\n------------------------------------------------------------------------------------\n";
		alertString2 += _alertString;
		alert(alertString2);
	}
}
</script>
<div id="main">
<!-- TMPL_IF NAME="add_form" -->
	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
		<input type="hidden" name="op" value="add_validate" />
		<input type="hidden" name="checked" value="0" />
	<table>
	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
	<tr>
			<!-- TMPL_IF NAME="frameworkcode" -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
			<!-- TMPL_ELSE -->
				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
			<!-- /TMPL_IF -->
			</tr>
			<tr>
				<td><label for="description">Description</label></td><td>
				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
</tr></table>
			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
	</form>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="delete_confirm" -->
<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
	<!-- TMPL_IF NAME="total" -->
		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times</div>
	<!-- /TMPL_IF -->
	<p>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" class="cancel" />
		</form>
		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" class="submit" /></form>
	</p>
<!-- /TMPL_IF -->

<!-- TMPL_IF NAME="else" -->
<h1>Biblio framework</h1>
<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
<table>
	<tr>
		<th>Code</th>
		<th>Description</th>
		<th>&nbsp;</th>
		<th>Edit</th>
		<th>Delete</th>
	</tr>
	<tr>
		<td>&nbsp;</td>
		<td>Default framework</td>
		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
		<td>&nbsp;</td>
		<td>&nbsp;</td>
	</tr>
	
	<!-- TMPL_LOOP NAME="loop" -->
		<tr>
			<td><!-- TMPL_VAR name="frameworkcode" --></td>
			<td><!-- TMPL_VAR name="frameworktext" --></td>
			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
	<input type="hidden" name="op" value="add_form" />
	<input type="submit" class="submit" value="Add framework" />
	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">
	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
	<div class="help">
		<h3>HINT for issues</h3>
		<p>Each box needs to be filled in with issuelength,maxissues</p>
		<p>eq <span class="ex">21,5</span> enables 5 issues for 21 days</p>
		</div>
	<div class="help">
		<h3>HINT for fines</h3>
		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
		<p>eg <span class="ex">1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
	</div>
	<div class="help">
		<h3>Default values</h3>
		<p> If a cell is not filled, the 1st of the following value is searched :</p>
		<ul>
			<li>same branch and same borrower category, itemtype *</li>
			<li>same branch and same itemtype, borrower category *</li>
			<li>same itemtype and borrower category, branch *</li>
			<li>everywhere</li>
			<li>If nothing is set, default is 21,5 (hardcoded)</li>
		</ul>
	</div>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
		<label for="branch">Select a branch :</label>
			<select id="branch" name="branch">
				<option value="">Default</option>
			<!-- TMPL_LOOP NAME="branchloop" -->
				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
			<input type="submit" value="Select" class="submit" />
		</form>
		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
			<input type="hidden" name="op" value="save" />
			<div class="data">
			<table>
			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
			<tr>
				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
			</tr>
			<!-- TMPL_LOOP NAME="row" -->
				<tr>
					<th><!-- TMPL_VAR NAME="categorycode" --></th>
					<!-- TMPL_LOOP NAME="cell" -->
						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
						</td>
					<!-- /TMPL_LOOP -->
				</tr>
			<!-- /TMPL_LOOP -->
			</table>
			</div>
			<input type="submit" value="Save Changes" class="submit" />
		</form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 19:03:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:03:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.35
Message-ID: <E1Crgef-0003zx-FR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15346/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:03:33 -0000	1.35
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:04:51 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:04:51 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/includes common-style.css,1.34,1.34.2.1
Message-ID: <E1Crgfr-000461-LG@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15729/koha-tmpl/intranet-tmpl/default/en/includes

Modified Files:
      Tag: rel_2_2
	common-style.css 
Log Message:
Adding declaration for tr.hilighted to match td.hilighted (for alternating row colors)

Index: common-style.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C2 -r1.34 -r1.34.2.1
*** common-style.css	9 Dec 2004 19:44:09 -0000	1.34
--- common-style.css	20 Jan 2005 18:04:49 -0000	1.34.2.1
***************
*** 105,109 ****
  }
  /* hilighted cell */
! td.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;
--- 105,109 ----
  }
  /* hilighted cell */
! td.hilighted, tr.hilighted {
  	border-left:0px;
  	background-color:#ffffcc;




From oleonard at users.sourceforge.net  Thu Jan 20 19:42:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:42:37 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32.2.1,1.32.2.2
Message-ID: <E1CrhGP-0006Um-PO@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24947/admin

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C2 -r1.32.2.1 -r1.32.2.2
*** marc_subfields_structure.pl	19 Jan 2005 17:17:10 -0000	1.32.2.1
--- marc_subfields_structure.pl	20 Jan 2005 18:42:29 -0000	1.32.2.2
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 19:44:13 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:44:13 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.38.2.1
Message-ID: <E1CrhHx-0006bv-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25334/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -r1.38 -r1.38.2.1
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:44:05 -0000	1.38.2.1
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:45:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:45:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters marc_subfields_structure.tmpl,1.38,1.39
Message-ID: <E1CrhJF-0006iP-LS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25747/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	marc_subfields_structure.tmpl 
Log Message:
Altering table row color declaration to match changes in issuingrules.pl (moving color declaration out of script and into template)

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** marc_subfields_structure.tmpl	3 Jan 2005 10:48:39 -0000	1.38
--- marc_subfields_structure.tmpl	20 Jan 2005 18:45:29 -0000	1.39
***************
*** 114,118 ****
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>
--- 114,118 ----
  	<th>Delete</th>
  <!-- TMPL_LOOP NAME="loop" -->
! <tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPL_IF -->>
  	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
  	<td>




From oleonard at users.sourceforge.net  Thu Jan 20 19:48:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 10:48:17 -0800
Subject: [Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.32,1.33
Message-ID: <E1CrhLt-0006vq-6J@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26578/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** marc_subfields_structure.pl	3 Jan 2005 12:56:30 -0000	1.32
--- marc_subfields_structure.pl	20 Jan 2005 18:48:12 -0000	1.33
***************
*** 154,165 ****
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle="white";
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
--- 154,165 ----
  	$sth->execute($tagfield,$frameworkcode);
  	my @loop_data = ();
! 	my $toggle=1;
  	my $i=0;
  	while ($data =$sth->fetchrow_hashref) {
  		my %row_data;  # get a fresh hash for the row data
! 		if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
***************
*** 358,368 ****
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle="white";
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 'white'){
! 			$toggle="#ffffcc";
  	  	} else {
! 			$toggle="white";
  	  	}
  		my %row_data;  # get a fresh hash for the row data
--- 358,368 ----
  	my $env;
  	my ($count,$results)=StringSearch($env,$tagfield,$frameworkcode);
! 	my $toggle=1;
  	my @loop_data = ();
  	for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
! 	  	if ($toggle eq 1){
! 			$toggle=0;
  	  	} else {
! 			$toggle=1;
  	  	}
  		my %row_data;  # get a fresh hash for the row data
***************
*** 382,386 ****
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{bgcolor} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;
--- 382,386 ----
  		$row_data{link}	= $results->[$i]{'link'};
  		$row_data{delete} = "$script_name?op=delete_confirm&amp;tagfield=$tagfield&amp;tagsubfield=".$results->[$i]{'tagsubfield'}."&frameworkcode=$frameworkcode";
! 		$row_data{toggle} = $toggle;
  		if ($row_data{tab} eq -1) {
  			$row_data{subfield_ignored} = 1;




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui acqui-home.tmpl,1.3,1.3.2.1 acquire.tmpl,1.1,1.1.2.1 basket.tmpl,1.2,1.2.2.1 newbasket2.tmpl,1.1,1.1.2.1 order.tmpl,1.2,1.2.2.1 recieve.tmpl,1.1,1.1.2.1 recieveorder.tmpl,1.1,1.1.2.1 supplier.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri2G-00010b-PC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3765/koha-tmpl/intranet-tmpl/npl/en/acqui

Modified Files:
      Tag: rel_2_2
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	order.tmpl recieve.tmpl recieveorder.tmpl supplier.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acqui-home.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** acqui-home.tmpl	28 Oct 2004 17:12:26 -0000	1.3
--- acqui-home.tmpl	20 Jan 2005 19:31:57 -0000	1.3.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/acquire.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** acquire.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- acquire.tmpl	20 Jan 2005 19:31:57 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->Invoice, <!-- TMPL_VAR NAME="invoice" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** basket.tmpl	28 Oct 2004 17:12:26 -0000	1.2
--- basket.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->Shopping Basket (<!-- TMPL_VAR NAME="basketno" -->) for <!-- TMPL_VAR NAME="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/newbasket2.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newbasket2.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- newbasket2.tmpl	20 Jan 2005 19:31:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Shopping Basket For: <!-- TMPL_VAR name="bookselname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/order.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** order.tmpl	28 Oct 2004 17:12:27 -0000	1.2
--- order.tmpl	20 Jan 2005 19:31:58 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Supplier Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieve.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieve.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieve.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/recieveorder.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** recieveorder.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- recieveorder.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Receive Orders From Supplier <!-- TMPL_VAR name="name" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** supplier.tmpl	19 Feb 2004 18:59:36 -0000	1.1
--- supplier.tmpl	20 Jan 2005 19:31:59 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE name="main-top.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME=id -->Update: <!-- TMPL_VAR name="name" --><!-- TMPL_ELSE -->Add supplier<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE name="masthead.inc" -->
  <!-- TMPL_INCLUDE name="intranet-nav.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 20:32:40 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:32:40 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple marcimport.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri2q-00012w-51@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4009/koha-tmpl/intranet-tmpl/npl/en/acqui.simple

Modified Files:
      Tag: rel_2_2
	marcimport.tmpl 
Log Message:
Correction to header includes

Index: marcimport.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** marcimport.tmpl	13 Apr 2004 16:51:08 -0000	1.2
--- marcimport.tmpl	20 Jan 2005 19:32:37 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Import<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 20:34:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:34:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Cri49-00017f-GK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4275/koha-tmpl/intranet-tmpl/npl/en/bookshelves

Modified Files:
      Tag: rel_2_2
	addbookbybiblionumber.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bookshelves/addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** addbookbybiblionumber.tmpl	11 Jan 2005 16:46:27 -0000	1.1.2.1
--- addbookbybiblionumber.tmpl	20 Jan 2005 19:33:57 -0000	1.1.2.2
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE Name="main-top.inc" -->
  <div id="main-compact">
  <form>
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <div id="main-compact">
  <form>




From oleonard at users.sourceforge.net  Thu Jan 20 20:35:49 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:35:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ branchtransfers.tmpl,1.2,1.2.2.1
Message-ID: <E1Cri5t-0001Dp-37@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4677/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	branchtransfers.tmpl 
Log Message:
Converting pop-up links to normal links

Index: branchtransfers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/branchtransfers.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** branchtransfers.tmpl	13 Apr 2004 16:53:45 -0000	1.2
--- branchtransfers.tmpl	20 Jan 2005 19:35:46 -0000	1.2.2.1
***************
*** 12,18 ****
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->" onclick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
--- 12,18 ----
  	<div class="form">
  		<table>
! 		<caption><!-- TMPL_IF Name="reserved" -->Reserve found for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="waiting" -->
!     Item is marked waiting at <!-- TMPL_VAR Name="branchname" --> for <!-- TMPL_VAR Name="name" --> (<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>).<!-- /TMPL_IF --></caption>
  		<tr><th>
  			<!-- TMPL_IF Name="reserved" -->Set reserve to waiting and transfer book to <b><!-- TMPL_VAR Name="branchname" --> </b>: <!-- /TMPL_IF -->
***************
*** 94,99 ****
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"
! onClick="openWindow(this,'Member', 480, 640)"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
--- 94,98 ----
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF Name="errwasreturned" -->
! 			Item was on loan to <a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a>
  <!-- TMPL_VAR Name="name" --> and has been returned.
  		<!-- /TMPL_IF -->
***************
*** 126,130 ****
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640)"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>
--- 125,129 ----
  		<!-- TMPL_LOOP Name="trsfitemloop" -->
  			<tr><td>
! 			<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR Name="barcode" --></a></td>
  			<td><!-- TMPL_VAR Name="title" --></td>
  			<td><!-- TMPL_VAR Name="author" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 20:37:02 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 11:37:02 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/members member-flags.tmpl,1.2,1.2.2.1 newimember.tmpl,1.1,1.1.2.1 newjmember.tmpl,1.1,1.1.2.1 newmember.tmpl,1.1,1.1.2.1
Message-ID: <E1Cri74-0001If-Dj@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4947/koha-tmpl/intranet-tmpl/npl/en/members

Modified Files:
      Tag: rel_2_2
	member-flags.tmpl newimember.tmpl newjmember.tmpl 
	newmember.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: member-flags.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/member-flags.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** member-flags.tmpl	13 Apr 2004 16:59:43 -0000	1.2
--- member-flags.tmpl	20 Jan 2005 19:36:57 -0000	1.2.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newimember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newimember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newimember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newimember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm New Borrower<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

Index: newjmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newjmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newjmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newjmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->

Index: newmember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/newmember.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** newmember.tmpl	1 Apr 2004 20:30:03 -0000	1.1
--- newmember.tmpl	20 Jan 2005 19:36:58 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Confirm Record<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:19:10 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:19:10 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22.2.1,1.22.2.2
Message-ID: <E1Crilq-0004fb-5P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17861/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -r1.22.2.1 -r1.22.2.2
*** categorie.tmpl	19 Jan 2005 17:24:11 -0000	1.22.2.1
--- categorie.tmpl	20 Jan 2005 20:19:05 -0000	1.22.2.2
***************
*** 261,265 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 261,265 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:04 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:04 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters categorie.tmpl,1.22,1.23
Message-ID: <E1Crimi-0004kC-LA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18170/koha-tmpl/intranet-tmpl/default/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Altering table row color declaration to match changes in categorie.pl (moving color declaration out of script and into template)

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** categorie.tmpl	3 Dec 2004 21:44:04 -0000	1.22
--- categorie.tmpl	20 Jan 2005 20:20:01 -0000	1.23
***************
*** 263,267 ****
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>
--- 263,267 ----
  			</tr>
  			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr<!-- TMPL_IF NAME="toggle" --> class="hilighted"<!-- /TMPl_IF -->>
  				<td><!-- TMPL_VAR NAME="categorycode" --></td>
  				<td><!-- TMPL_VAR NAME="description" --></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:20:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:20:18 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.16.2.1
Message-ID: <E1Crimw-0004le-B9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18302/admin

Modified Files:
      Tag: rel_2_2
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -C2 -r1.16 -r1.16.2.1
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:15 -0000	1.16.2.1
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:21:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:21:11 -0800
Subject: [Koha-cvs] CVS: koha/admin categorie.pl,1.16,1.17
Message-ID: <E1Crinn-0004oi-JN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18443/admin

Modified Files:
	categorie.pl 
Log Message:
Changing table row color toggle so that color values can be specified in the template instead of the script (requires update to template)

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** categorie.pl	18 Aug 2004 16:05:14 -0000	1.16
--- categorie.pl	20 Jan 2005 20:20:57 -0000	1.17
***************
*** 163,167 ****
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 'white';
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
--- 163,167 ----
  	my @loop;
  	my ($count,$results)=StringSearch($env,$searchfield,'web');
! 	my $toggle = 0;
  	for (my $i=0; $i < $count; $i++){
  		my %row = (categorycode => $results->[$i]{'categorycode'},
***************
*** 176,186 ****
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 'white' )
  		{
! 			$toggle = '#ffffcc';
  		}
  		else
  		{
! 			$toggle = 'white';
  		}
  	}
--- 176,186 ----
  				toggle => $toggle );	
  		push @loop, \%row;
! 		if ( $toggle eq 0 )
  		{
! 			$toggle = 1;
  		}
  		else
  		{
! 			$toggle = 0;
  		}
  	}




From oleonard at users.sourceforge.net  Thu Jan 20 21:22:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:22:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categoryitem.tmpl,1.1,1.1.2.1
Message-ID: <E1CripH-0004uJ-3z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18847/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categoryitem.tmpl 
Log Message:
Modified header includes to allow for custom title tags for each page

Index: categoryitem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categoryitem.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** categoryitem.tmpl	19 Feb 2004 19:14:35 -0000	1.1
--- categoryitem.tmpl	20 Jan 2005 20:22:40 -0000	1.1.2.1
***************
*** 1,3 ****
! <!-- TMPL_INCLUDE NAME="main-top.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 1,3 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 21:23:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:23:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.2.2.1
Message-ID: <E1Cripq-0004wg-8T@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18976/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:23:15 -0000	1.2.2.1
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 21:24:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 12:24:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters categorie.tmpl,1.2,1.3
Message-ID: <E1Criqh-00050w-7i@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19188/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	categorie.tmpl 
Log Message:
Synching with default tempalte

Index: categorie.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/categorie.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** categorie.tmpl	13 Apr 2004 17:06:10 -0000	1.2
--- categorie.tmpl	20 Jan 2005 20:24:08 -0000	1.3
***************
*** 4,8 ****
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
--- 4,8 ----
  <!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="admin-topmenu.inc" -->
***************
*** 88,99 ****
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /></td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /></td></tr>
! 	<tr><th>Fine type</th><td><input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME=finetype -->" /></td></tr>
! 	<tr><th>Bulk</th><td><input type="text" name="bulk" value="<!-- TMPL_VAR NAME=bulk -->" /></td></tr>
! 	<tr><th>Enrollment fee</th><td><input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Issue limit</th><td><input type="text" name="issuelimit" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="issuelimit" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td><input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
--- 88,96 ----
  	<tr><th>Description</th><td><input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
  	<tr><th>Enrolment period</th><td><input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
! 	<tr><th>Upperage limit</th><td><input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
! 	<tr><th>Age Required</th><td><input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
! 	<tr><th>Enrollment fee</th><td>$<input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
  	<tr><th>Overdue notice required</th><td><input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->" /></td></tr>
! 	<tr><th>Reserve fee</th><td>$<input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
  </table></div>
  	<p>				<input type="button" class="submit" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" class="cancel" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
***************
*** 113,138 ****
  	
          	
! 	<h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2>
! <!-- TMPL_IF NAME="totalgtzero" --><p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p><!-- /TMPL_IF -->
! 	<div class="form"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --></td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --></td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td></tr>
! 	<tr><th>Fine type</th><td><!-- TMPL_VAR NAME="finetype" --></td></tr>
! 	<tr><th>Bulk</th><td><!-- TMPL_VAR NAME="bulk" --></td></tr>
! 	<tr><th>Enrolment fee</th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_VAR NAME="overduenoticerequired" --></td></tr>
! 	<tr><th>Issue limit</th><td><!-- TMPL_VAR NAME="issuelimit" --></td></tr>
! 	<tr><th>Reserve fee</th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <p><span class="alert">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span></p>
! 				<div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed" />
! 			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="OK" class="submit" />
! 				</form></div>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
--- 110,127 ----
  	
          	
! 	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</div><!-- /TMPL_IF -->
! 	<div class="compact"><table>
  	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
  	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
! 	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
! 	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
! 	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
! 	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
! 	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
! 	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
  </table></div>
  		<!-- TMPL_IF NAME="totalgtzero" -->
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" class="submit" /></form>
  		<!-- TMPL_ELSE -->
  <div class="tabitem"><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
***************
*** 159,190 ****
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="table"><table>
  		<tr>
! 			<th>Category</th>
! 			<th>Description</th>
! 			<th>Enrollment</th>
! 			<th>Upper Age Limit</th>
! 			<th>Age Required</th>
! <!-- 			<th>Fine</th> -->
! 			<th>Bulk</th>
! <!-- 			<th>Fee</th> -->
! 			<th>Overdue</th>
! 			<th>Issue Limit</th>
! <!-- 			<th>Reserve</th> -->
! 			<th colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="finetype" --></td> -->
!                         <td><!-- TMPL_VAR NAME="bulk" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td> -->
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
! <!--                         <td><!-- TMPL_VAR NAME="reservefee" --></td> -->
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>
--- 148,177 ----
  		<input type="submit" name="search" class="submit" value="Find" />
  	</form>	
!         <div class="data"><table>
  		<tr>
! 			<th scope="col">Category</th>
! 			<th scope="col">Description</th>
! 			<th scope="col">Enrollment Period</th>
! 			<th scope="col">Upper Age Limit</th>
! 			<th scope="col">Age Required</th>
!  			<th scope="col">Fine</th>
!  			<th scope="col">Enrollment Fee</th>
! 			<th scope="col">Overdue</th>
! 			<th scope="col">Issue Limit</th>
!  			<th scope="col">Reservation Fee</th>
! 			<th scope="col" colspan="2">&nbsp; </th>
  		</tr>
  		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPl_IF -->>
                          <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="categorycode" --></a></td>
                          <td><!-- TMPL_VAR NAME="description" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
!                         <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
!                         <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
!                         <td><!-- TMPL_VAR NAME="finetype" --></td>
!                         <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
                          <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
                          <td><!-- TMPL_VAR NAME="issuelimit" --></td>
!                         <td><!-- TMPL_VAR NAME="reservefee" --></td>
                          <td><a class="edit" href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
                          <td><a class="delete" href="<!-- TMPL_VAR NAME=script_name -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></td>




From oleonard at users.sourceforge.net  Thu Jan 20 22:27:54 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:27:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrjqM-00010Q-DL@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3838/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
      Tag: rel_2_2
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** acceptorreject.tmpl	13 Jan 2005 20:56:56 -0000	1.1.2.1
--- acceptorreject.tmpl	20 Jan 2005 21:27:52 -0000	1.1.2.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:30:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:30:31 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/suggestion acceptorreject.tmpl,1.1,1.2
Message-ID: <E1Crjst-00019B-IP@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4357/koha-tmpl/intranet-tmpl/npl/en/suggestion

Modified Files:
	acceptorreject.tmpl 
Log Message:
Moving submit button inside form tag where it might do some good.

Index: acceptorreject.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** acceptorreject.tmpl	13 Jan 2005 20:48:31 -0000	1.1
--- acceptorreject.tmpl	20 Jan 2005 21:30:20 -0000	1.2
***************
*** 35,41 ****
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table></form>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! 
  	
  <!-- /TMPL_IF -->
--- 35,41 ----
  			</tr>
  		<!-- /TMPL_LOOP -->
! 		</table>
  		<p><input type="submit" class="submit" value="Change Status"></p>
! </form>
  	
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Thu Jan 20 22:31:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:31:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,NONE,1.1.2.1 suggestion-select.tmpl,NONE,1.1.2.1
Message-ID: <E1Crjte-0001DJ-QR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4647/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
      Tag: rel_2_2
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Order Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	<h1>Order search</h3>
	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post"><table>
		<tr>
			<th>&nbsp;</th>
			<th>Title</th>
			<th>Author</th>
			<th>Supplier</th>
			<th>Placed on</th>
			<th>Recieved on</th>
			<th>Quantity ordered</th>
			<th>&nbsp;</th>
		</tr>
		<tr>
			
				<th>Filter By:</th>
				<th><input type="text" name="title" value="<!-- TMPL_VAR name="title"-->" /></th>
				<th><input type="text" name="author" value="<!-- TMPL_VAR name="author" -->" /></th>
				<th><input type="text" name="name" value="<!-- TMPL_VAR name="name" -->" /></th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th>&nbsp;</th>
				<th><input type="submit" class="submit" value="Set Filter" /></th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr>
				<td>&nbsp;</td>
				<td><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
				<td><!-- TMPL_VAR NAME="author" --></td>
				<td><!-- TMPL_VAR NAME="name" --></td>
				<td><!-- TMPL_VAR name="creationdate" --></td>
				<td><!-- TMPL_VAR name="datereceived" --></td>
				<td><!-- TMPL_VAR name="quantity" --></td>
				<td>&nbsp;</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table></form>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE name="masthead.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->

<div id="main">
	
	<form action="/cgi-bin/koha/acqui/suggestion-select.pl" method="post">
<div class="data">	<table>
	<caption>Filter Suggestion Results</caption>
	<tr><th><label for="title">Title:</label></th><td><input type="text" name="title" id="title" value="<!-- TMPL_VAR NAME="title"-->" /></td></tr>
	<tr><th><label for="author">Author:</label> </th><td><input type="text" id="author" name="author" value="<!-- TMPL_VAR NAME="author" -->" /></td></tr>
	<tr><th><label for="publishercode">Publisher:</label></th><td><input type="text" id="publishercode" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode"-->" /></td></tr>
	</table></div>
<p><input type="submit" class="submit" value="Set Filter" /></p></form>
<div class="table searchresults">
	<table>
		<caption>Suggestions</caption>
		<tr>
			<th>Suggestion</th>
			<th>Suggested by</th>
			<th>Accepted by</th>
			<th>&nbsp;</th>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
				<td>
					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
					<p>
						<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR NAME="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR NAME="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR NAME="isbn" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR NAME="publishercode" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR NAME="publicationyear" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR NAME="place" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR NAME="note" -->)</i></p> <!-- /TMPL_IF -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamesuggestedby" -->
				</td>
				<td>
					<!-- TMPL_VAR NAME="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
				</td>
				<td>
					<!-- TMPL_IF name="biblionumber" -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->">Order</a>
					<!-- TMPL_ELSE -->
						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->">Order</a>
					<!-- /TMPL_IF -->
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->



From oleonard at users.sourceforge.net  Thu Jan 20 22:32:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:32:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui histsearch.tmpl,1.1,1.2 suggestion-select.tmpl,1.1,1.2
Message-ID: <E1CrjuT-0001GX-3H@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4840/koha-tmpl/intranet-tmpl/npl/en/acqui

Added Files:
	histsearch.tmpl suggestion-select.tmpl 
Log Message:
Synching with default tempalte






From oleonard at users.sourceforge.net  Thu Jan 20 22:44:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:44:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en about.tmpl,1.2,1.2.2.1
Message-ID: <E1Crk6s-000260-J6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8035/koha-tmpl/intranet-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	about.tmpl 
Log Message:
Synching with default tempalte

Index: about.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/about.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** about.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- about.tmpl	20 Jan 2005 21:44:56 -0000	1.2.2.1
***************
*** 1,4 ****
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
--- 1,4 ----
  <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- About Koha
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
  <!-- TMPL_INCLUDE NAME="masthead.inc" -->
  <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
***************
*** 8,12 ****
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table"><div class="items"><table>
    <tr>
        <th>Koha version:</th>
--- 8,12 ----
  <p>Data about the current version of Koha for bug reports (or general 
  interest).</p>
! <div class="table items"><table>
    <tr>
        <th>Koha version:</th>
***************
*** 33,56 ****
   <table>
   <caption>Credits</caption>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li>Pat Eyler, Kaitiaki</li>
! 	<li>Paul Poulain, 2.0 release manager (MARC developper)</li>
! 	<li>Joshua Ferraro &amp; the Nelsonville Public Library (MARC features funders)</li>
! 	<li>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</li>
! 	<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 	<li>Mike Hansen</li>
! 	<li>MJ Ray and Turo Technology LLP, England (quality control, installer &amp; updater)</li>
! 	<li>Nicolas Morin, French Translation</li>
! <li><b>Horowhenua Library Trust</b>
! Rosalie Blake, Head of Libraries
! Jo Ransom</li>
! <li><b>Katipo Communications</b>
! Rachel Hamilton-Williams, General Manager (Webmistress)
! Chris Cormack, 1.2 release manager
! and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax,
! 						Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li></ul>
  					</td>
  				</tr>
--- 33,57 ----
   <table>
   <caption>Credits</caption>
+ 	<tr><th>Special thanks to the following funders</th></tr>
+ 			<tr><td><ul><li><b>Horowhenua Library Trust</b> and Rosalie Blake, Head of Libraries, (Koha 1.0)</li>
+ 		<li>The <b>Nelsonville Public Library</b> (MARC support)</li>
+ 		<li><b>EMN (Ecole des Mines de Nantes)</b> (Suggestion, stats modules and improved ldap support)</li>
+ 		<li><b>ENSMP (Ecole Nationale Sup?rieure des Mines de Paris)</b> (biblio frameworks, MARC authorities, OPAC basket, Serials support)</li></ul></td></tr>
    	<tr>
  	<th>Core Team</th></tr>
  	<tr><td>
  <ul>
! 	<li><b>Rachel Hamilton-Williams</b>, Kaitiaki</li>
! 		<li><b>Paul Poulain</b>, 2.2 release manager (MARC developper)</li>
! 		<li>Stephen Hedges and the <b>Nelsonville Public Library</b> (MARC features funders)</li>
! 		<li>Nicholas Rosasco, (Documentation Compiler)</li>
! 		<li>Mike Hansen</li>
! 		<li>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer and updater, 2.0 release maintainer)</li>
! 		<li><b>Katipo Communications</b></li>
! 		<ul>
! 			<li>Rachel Hamilton-Williams, General Manager (Webmistress)</li>
! 			<li>Chris Cormack, 1.2 release manager</li>
! 			<li>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson, Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</li>
! 			</ul>
  					</td>
  				</tr>
***************
*** 59,92 ****
  					<td>
  <ul>
! 	<li>Adam Thick</li>
! 	<li>Andrew Hooper</li>
! 	<li>Al Banks</li>
! 	<li>Ambrose Li</li>
! 	<li>Andrew Arensburger</li>
! 	<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 	<li>Brig C. McCoy</li>
! 	<li>Daniel Holth</li>
! 	<li>David Strainchamps</li>
! 	<li>Dorian Meid</li>
! 	<li>Ed Summers</li>
! 	<li>Florian Bischof</li>
! 	<li>Francisco M. Marzoa Alonso</li>
! 	<li>Glen Stewart</li>
! 	<li>Henri-Damien Laurent</li>
! 	<li>J?rome Vizcaino (Esiee School)</li>
! 	<li>Kip DeGraaf</li>
! 	<li>Marco Gaiarin</li>
! 	<li>Md. Aftabuddin</li>
! 	<li>Michaes Herman</li>
! 	<li>Michel Lerenard (Esiee School)</li>
! 	<li>Mike Johnson</li>
! 	<li>Mike Mylonas</li>
! 	<li>Pierre Cauchois (Esiee School)</li>
! 	<li>Pawel Skuza (Polish for 1.2)</li>
! 	<li>Regula Sebastiao</li>
! 	<li>Roger Buck</li>
! 	<li>Ron Wickersham</li>
! 	<li>Sebastiaan Durand</li>
! </ul>					</td>
  				</tr>
  			</table>
--- 60,94 ----
  					<td>
  <ul>
! 					<li>Adam Thick</li>
! 					<li>Andrew Hooper</li>
! 					<li>Al Banks</li>
! 					<li>Ambrose Li (chinese translation and translation tool)</li>
! 					<li>Andrew Arensburger (the small and great C4::Context module)</li>
! 					<li>Benedykt P. Barszcz (Polish for 2.0)</li>
! 					<li>Brig C. McCoy</li>
! 					<li>Daniel Holth</li>
! 					<li>David Strainchamps</li>
! 					<li>Dorian Meid (German translation)</li>
! 					<li><b>doXulting</b> (Matthieu Branlat) OPAC basket</li>
! 					<li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
! 					<li><b>Esiee School</b> (J?rome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
! 					<li>Florian Bischof</li>
! 					<li>Francisco M. Marzoa Alonso</li>
! 					<li>Glen Stewart</li>
! 					<li>Henri-Damien Laurent</li>
! 					<li>Jo Ransom</li>
! 					<li>Kip DeGraaf</li>
! 					<li>Marco Gaiarin</li>
! 					<li>Md. Aftabuddin</li>
! 					<li>Michaes Herman</li>
! 					<li>Mike Johnson</li>
! 					<li>Mike Mylonas</li>
! 					<li>Nicolas Morin (French Translation in 2.0)</li>
! 					<li>Pawel Skuza (Polish for 1.2)</li>
! 					<li>Regula Sebastiao</li>
! 					<li>Roger Buck</li>
! 					<li>Ron Wickersham</li>
! 					<li>Sebastiaan Durand</li>
! 					<li><b>Steve Tonnesen</b> (early MARC work, Virtual Bookshelves concept, KohaCD)</li></ul>					</td>
  				</tr>
  			</table>




From oleonard at users.sourceforge.net  Thu Jan 20 22:58:28 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:58:28 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CrkJw-0002t8-8g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11078/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
      Tag: rel_2_2
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** auth_tag_structure.tmpl	20 Jan 2005 17:41:00 -0000	1.1.2.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:58:25 -0000	1.1.2.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 22:59:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 13:59:17 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/parameters auth_tag_structure.tmpl,1.1,1.2
Message-ID: <E1CrkKj-0002vv-VZ@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11254/koha-tmpl/intranet-tmpl/npl/en/parameters

Modified Files:
	auth_tag_structure.tmpl 
Log Message:
Synching with default tempalte

Index: auth_tag_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** auth_tag_structure.tmpl	18 Jan 2005 22:53:04 -0000	1.1
--- auth_tag_structure.tmpl	20 Jan 2005 21:59:15 -0000	1.2
***************
*** 91,94 ****
--- 91,95 ----
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  		<input type="hidden" name="op" value="delete_confirmed" />
+ 		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
  		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
  	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>




From oleonard at users.sourceforge.net  Thu Jan 20 23:40:43 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:40:43 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.2
Message-ID: <E1Crkyp-0005c3-Kw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21546/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:40:40 -0000	1.2
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:41:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:41:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/authorities authorities-home.tmpl,1.1,1.1.2.1
Message-ID: <E1CrkzH-0005eo-6g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21736/koha-tmpl/intranet-tmpl/npl/en/authorities

Modified Files:
      Tag: rel_2_2
	authorities-home.tmpl 
Log Message:
Synching with default tempalte

Index: authorities-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** authorities-home.tmpl	28 Oct 2004 17:23:35 -0000	1.1
--- authorities-home.tmpl	20 Jan 2005 22:41:08 -0000	1.1.2.1
***************
*** 1,16 ****
!     <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
! <div id="mainbloc">
  
! <h1 class="authority">Authority search</h1>
  
! <form name="f" method="post">
! 	<input type="hidden" name="op" value="do_search">
! 	<input type="hidden" name="type" value="intranet">
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! 	<div id="bloc25">
! 		<h2 class="authority">Search on</h2>
! 		<p>
! 			<label class="label100">Authority type</label>
! 			<select name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
--- 1,16 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Authorities
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!-- TMPL_INCLUDE NAME="masthead.inc" -->
! <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
  
! <div id="main">
  
! <form name="f" method="post" action="/cgi-bin/koha/authorities/authorities-home.pl">
! 	<input type="hidden" name="op" value="do_search" />
! 	<input type="hidden" name="type" value="intranet" />
! 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
! <table>
! <caption>Authority search</caption>
! <tr><td><label for="authtypecode">Authority type</label></td><td><select id="authtypecode" name="authtypecode">
  			<!-- TMPL_LOOP NAME="authtypesloop" -->
  				<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
***************
*** 18,37 ****
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select>
! 		</p>
! 		<p>
! 			<label class="label100">Search value</label>
! 			<input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
! 			<input type="hidden" name="marclist" value="">
! 			<input type="hidden" name="and_or" value="and">
! 			<input type="hidden" name="excluding" value="">
! 			<input type="hidden" name="operator" value="contains">
! 		</p>
! 		<p>
! 			<input type="submit" value="Start search" class="button authority">
! 		</p>
! 	</div>
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="auth-bottom.inc" -->
  
--- 18,31 ----
  				</option>
  			<!-- /TMPL_LOOP -->
! 			</select></td></tr>
! <tr><td><label for="value">Search value</label></td><td><input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
! 			<input type="hidden" name="marclist" value="" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" /></td></tr>			
! </table>
! 	<input type="submit" value="Start search" class="submit" />
  </form>
  </div>
! <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
  




From oleonard at users.sourceforge.net  Thu Jan 20 23:48:32 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:48:32 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,NONE,1.1.2.1
Message-ID: <E1Crl6O-000687-Ur@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23551/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
      Tag: rel_2_2
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: ISBD View<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->

<div id="main">

<div class="tabitem"><form action="MARCdetail.pl" method="get">
<input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" />
<input type="submit" class="submit" value="View MARC" /></form> <form action="/cgi-bin/koha/moredetail.pl" method="get"><input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" /><input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" /><input type="submit" class="submit" value="Item Details" /></form> <form action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="submit" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form><!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --> <form action="request.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR name="biblionumber" -->" name="bib" /> <input type="submit" value="Place Reserve" class="submit" /></form> <form action="acqui.simple/addbiblio.pl"><input type="hidden" name="oldbiblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" value="Edit this Record" class="submit" /></form><!-- /TMPL_IF -->
</div>

	<div class="isbd">
		<p><!-- TMPL_VAR NAME="ISBD" --></p>
	</div>
</div>

<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->




From oleonard at users.sourceforge.net  Thu Jan 20 23:51:33 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 20 Jan 2005 14:51:33 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue ISBDdetail.tmpl,1.1,1.2
Message-ID: <E1Crl9J-0006PF-7p@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577/koha-tmpl/intranet-tmpl/npl/en/catalogue

Added Files:
	ISBDdetail.tmpl 
Log Message:
Synching with default template.  Still needs proper styling for ISBD block





From acli at users.sourceforge.net  Sun Jan 23 05:31:24 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:31:24 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator translator_doc.html,1.2,1.2.2.1 translator_doc.txt,1.6,1.6.2.1
Message-ID: <E1CsZPI-0007EL-Fu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27739

Modified Files:
      Tag: rel_2_2
	translator_doc.html translator_doc.txt 
Log Message:
Minor updates


Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** translator_doc.html	30 Dec 2004 06:58:19 -0000	1.2
--- translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
***************
*** 4,8 ****
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts:
  
  <ul>
--- 4,9 ----
  <p>
  This transation tool should greatly help Koha translators.
! It's composed of 2&nbsp;scripts
! (with a number of associated perl module files):
  
  <ul>
***************
*** 28,32 ****
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
--- 29,33 ----
      (assuming your current directory is this directory, i.e., misc/translator):
      <blockquote>
! ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>(In the above example,
***************
*** 41,45 ****
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
      </blockquote>
      <p>
--- 42,46 ----
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
      <p>
***************
*** 55,65 ****
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process.pl update -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your new css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process.pl install -i /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed
--- 56,66 ----
  <li>Update your translation file:
      <blockquote>
! ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
      </blockquote>
! <li>Translate your newly updated css_opac_fr_FR.po file.
      Look for strings marked as "fuzzy" and strings that are not translated.
  <li>Create your translated templates:
      <blockquote>
! ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
      </blockquote>
  <li>Copy new images/css files in your new directory if needed

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** translator_doc.txt	3 Jan 2005 16:30:13 -0000	1.6
--- translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
***************
*** 3,7 ****
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts:
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
--- 3,7 ----
  
  This transation tool should greatly help Koha translators. It's composed of
! 2 scripts (with a number of associated perl module files):
  
    * xgettext.pl, that extracts the texts in a template, and which is called by
***************
*** 22,26 ****
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
--- 22,27 ----
      directory, i.e., misc/translator):
     
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
     
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
***************
*** 33,37 ****
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
--- 34,40 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
     
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
***************
*** 44,48 ****
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i ../../opac-tmpl/default/en -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
--- 47,52 ----
   1. Update your translation file:
     
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
     
   2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
***************
*** 50,62 ****
   3. Create your translated templates:
     
!         ./tmpl_process.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o ../../koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
-  
- REBUILD ALL
- ===========
- The rebuild_lang.sh script can be used to rebuild all languages officially supported in 2.2 release, when needed.
- Useful for developpers, probably useless for all end-users.
- 
  
  WEAKNESSES
--- 54,62 ----
   3. Create your translated templates:
     
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
     
   4. Copy new images/css files in your new directory if needed
  
  WEAKNESSES
***************
*** 71,73 ****
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
\ No newline at end of file
--- 71,74 ----
    * Paul Poulain (paul.poulain _ at _ free.fr) & Jerome Vizcaino (vizcainj _ at _
      esiee.fr)
!   * Parts of V3.0 by Ambrose Li (acli _ at _ ada.dhs.org)
! 




From acli at users.sourceforge.net  Sun Jan 23 05:58:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:58:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1.2.1,1.1.2.2
Message-ID: <E1CsZph-0000MQ-LC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1353

Modified Files:
      Tag: rel_2_2
	Makefile 
Log Message:
Forgot to take out this debugging code


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
--- Makefile	23 Jan 2005 04:58:39 -0000	1.1.2.2
***************
*** 2,6 ****
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:
--- 2,6 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
  
  clean:




From acli at users.sourceforge.net  Sun Jan 23 05:57:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 20:57:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator Makefile,1.1,1.1.2.1 translator_doc.html,1.2.2.1,1.2.2.2 translator_doc.txt,1.6.2.1,1.6.2.2
Message-ID: <E1CsZow-0000JI-UF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv985

Modified Files:
      Tag: rel_2_2
	Makefile translator_doc.html translator_doc.txt 
Log Message:
Minor corrections & clarifications, and make the command line examples
not break in the middle (like in the original version)


Index: Makefile
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/Makefile,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** Makefile	30 Dec 2004 06:48:19 -0000	1.1
--- Makefile	23 Jan 2005 04:57:51 -0000	1.1.2.1
***************
*** 2,4 ****
  
  %.txt: %.html
! 	LANG=C w3m $< > $@
--- 2,7 ----
  
  %.txt: %.html
! 	set -x; sed -e 's/<blockquote>/&<table border=0 width="100%"><tr><td nowrap><pre>/g' -e 's/<\/blockquote>/<\/pre><\/table>&/g' $<|tee foo|LANG=C w3m -T text/html -cols 80 | sed -e 's/  *$$//g' | cat -s > $@
! 
! clean:
! 	rm translator_doc.txt

Index: translator_doc.html
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.html,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** translator_doc.html	23 Jan 2005 04:31:07 -0000	1.2.2.1
--- translator_doc.html	23 Jan 2005 04:57:51 -0000	1.2.2.2
***************
*** 7,18 ****
  (with a number of associated perl module files):
  
! <ul>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ul>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories)
!     <li>update an existing translation file.
!     <li>rebuild translated templates from english & translation file.
      </ul>
  </ul>
--- 7,18 ----
  (with a number of associated perl module files):
  
! <ol>
  <li>xgettext.pl, that extracts the texts in a template,
!     and which is called by the script; and
  <li>tmpl_process3.tmpl, which can do 3 things:
!     <ol type=a>
!     <li>create a file with all the "translatable strings" in all files in a directory (& its subdirectories),
!     <li>update an existing translation file, and
!     <li>rebuild translated templates from English & translation file.
      </ul>
  </ul>
***************
*** 35,41 ****
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended
!     but is not necessary;
!     it makes the resulting PO files somewhat easier to read.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
--- 35,43 ----
      contains the English templates in the "default" theme,
      and po/css_opac_fr_FR.po is where you want the generated PO file to appear.
!     The use of relative paths for the English templates is recommended;
!     it makes the resulting PO files slightly shorter
!     and more usable in a team environment.
!     Absolute paths are certainly fine,
!     and might be better if there is only one translator for your language.)
  <li>Translate your css_opac_fr_FR.po file
      using a text editor or a PO file translation tool.
***************
*** 52,56 ****
  
  <p>
! If something changes in English version:
  <ol>
  <li>Update your translation file:
--- 54,58 ----
  
  <p>
! If something changes in the English version:
  <ol>
  <li>Update your translation file:

Index: translator_doc.txt
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/translator_doc.txt,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** translator_doc.txt	23 Jan 2005 04:31:07 -0000	1.6.2.1
--- translator_doc.txt	23 Jan 2005 04:57:51 -0000	1.6.2.2
***************
*** 5,15 ****
  2 scripts (with a number of associated perl module files):
  
!   * xgettext.pl, that extracts the texts in a template, and which is called by
!     the script
!   * tmpl_process3.tmpl, which can do 3 things:
!       + create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories)
!       + update an existing translation file.
!       + rebuild translated templates from english & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
--- 5,15 ----
  2 scripts (with a number of associated perl module files):
  
!  1. xgettext.pl, that extracts the texts in a template, and which is called by
!     the script; and
!  2. tmpl_process3.tmpl, which can do 3 things:
!      a. create a file with all the "translatable strings" in all files in a
!         directory (& its subdirectories),
!      b. update an existing translation file, and
!      c. rebuild translated templates from English & translation file.
  
  Call tmpl_process3.pl --help to get a more detailed explanation. Some
***************
*** 21,41 ****
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
!    
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s
!         po/css_opac_fr_FR.po -r
!    
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended but is not necessary; it makes the
!     resulting PO files somewhat easier to read.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o
!         /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/
!         css_opac_fr_FR.po -r
!    
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
--- 21,40 ----
   1. Create your translation file (assuming your current directory is this
      directory, i.e., misc/translator):
! 
!         ./tmpl_process3.pl create -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, ../../koha-tmpl/opac-tmpl/default/en/ contains the
      English templates in the "default" theme, and po/css_opac_fr_FR.po is where
      you want the generated PO file to appear. The use of relative paths for the
!     English templates is recommended; it makes the resulting PO files slightly
!     shorter and more usable in a team environment. Absolute paths are certainly
!     fine, and might be better if there is only one translator for your
!     language.)
   2. Translate your css_opac_fr_FR.po file using a text editor or a PO file
      translation tool.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
      (In the above example, /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default
      /fr2/ is where you want your translated templates to be saved.)
***************
*** 43,61 ****
      tmpl_process3.pl install).
  
! If something changes in English version:
  
   1. Update your translation file:
!    
!         ./tmpl_process3.pl update -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
!    
!  2. Translate your new css_opac_fr_FR.po file. Look for strings marked as
!     "fuzzy" and strings that are not translated.
   3. Create your translated templates:
!    
!         ./tmpl_process3.pl install -i /home/paul/koha.dev/koha/koha-tmpl/
!         opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/
!         default/fr2/ -s po/css_opac_fr_FR.po -r
!    
   4. Copy new images/css files in your new directory if needed
  
--- 42,57 ----
      tmpl_process3.pl install).
  
! If something changes in the English version:
  
   1. Update your translation file:
! 
!         ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/default/en/ -s po/css_opac_fr_FR.po -r
! 
!  2. Translate your newly updated css_opac_fr_FR.po file. Look for strings
!     marked as "fuzzy" and strings that are not translated.
   3. Create your translated templates:
! 
!         ./tmpl_process3.pl install -i ../../koha-tmpl/opac-tmpl/default/en/ -o /home/paul/koha.dev/koha/koha-tmpl/opac-tmpl/default/fr2/ -s po/css_opac_fr_FR.po -r
! 
   4. Copy new images/css files in your new directory if needed
  




From acli at users.sourceforge.net  Sun Jan 23 06:16:18 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 21:16:18 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.3,1.1.2.4
Message-ID: <E1Csa6k-0001Gt-8L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4100

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Added a --pot option to generate the POT (PO template) file.

The POT files are currently named like css_opac_en_EN.po, which
are not what they would usually be named.


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** update.pl	11 Jan 2005 09:50:58 -0000	1.1.2.3
--- update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
***************
*** 6,12 ****
  use strict;
  use integer;
  
  my $lang = $ARGV[0];
! die "Usage: $0 LANG\n" unless $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
  
  # Remember whether we see the "po" directory; this is used later to guess
--- 6,22 ----
  use strict;
  use integer;
+ use Getopt::Long;
+ 
+ use vars qw( $pot_p );
+ 
+ GetOptions(
+    '--pot' => \$pot_p,
+ ) || exit(1);
  
  my $lang = $ARGV[0];
! die <<EOF unless $pot_p || $lang =~ /^[a-z]{2}(?:_[A-Z]{2})?$/;
! Usage: $0 LANG
!        $0 --pot
! EOF
  
  # Remember whether we see the "po" directory; this is used later to guess
***************
*** 32,38 ****
  
        # Now call tmpl_process3.pl to do the real work
!       exec('./tmpl_process3.pl', 'update',
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', "po/${theme}_${module}_$lang.po", '-r');
  
        die "tmpl_process3.pl: exec: $!\n";
--- 42,54 ----
  
        # Now call tmpl_process3.pl to do the real work
!       #
!       # Traditionally, the pot file should be named PACKAGE.pot
!       # (for Koha probably something like koha_intranet_css.pot),
!       # but this is not Koha's convention.
!       #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
!       exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",
! 	    '-s', $target, '-r');
  
        die "tmpl_process3.pl: exec: $!\n";




From acli at users.sourceforge.net  Sun Jan 23 07:15:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:15:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_fr_FR.po,1.6,1.6.2.1
Message-ID: <E1Csb1z-0004dd-Gm@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17798

Modified Files:
      Tag: rel_2_2
	css_opac_fr_FR.po 
Log Message:
Minor syntactical corrections


Index: css_opac_fr_FR.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_fr_FR.po,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** css_opac_fr_FR.po	5 Jan 2005 14:41:49 -0000	1.6
--- css_opac_fr_FR.po	23 Jan 2005 06:15:24 -0000	1.6.2.1
***************
*** 1,17 ****
! # Penbwrdd yn Gymraeg.
! # Copyright (C) 2003 Free Software Foundation, Inc.
! # www.kyfieithu.co.uk<kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>, 2003.
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: PACKAGE VERSION\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: www.kyfieithu.co.uk <kyfieithu at dotmon.com>, www.gyfieithu.co.uk<kyfieithu at dotmon.com>\n"
! "Language-Team: Cymraeg <cy at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8-bit\n"
- "X-Generator: Kartouche 0.2 - 28 October 2003\n"
  "\n"
  
--- 1,17 ----
! # Koha OPAC module, French translation
! # Copyright (C) 2000-2005 Katipo Communications
! # This file is distributed under the same license as the Koha package.
! # Copyright 2004-2005 French translation team
  #
  #
  msgid ""
  msgstr ""
! "Project-Id-Version: koha-opac 2.2\n"
  "PO-Revision-Date: 2004-12-07 11:28+0200\n"
! "Last-Translator: Paul POULAIN <tipaul at users.sourceforge.net>\n"
! "Language-Team: French <fr at li.org>\n"
  "MIME-Version: 1.0\n"
! "Content-Type: text/plain; charset=ISO-8859-1\n"
  "Content-Transfer-Encoding: 8-bit\n"
  "\n"
  
***************
*** 284,289 ****
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s  	    	

!  	"
  
  #. For the first occurrence, 
--- 284,288 ----
  #, c-format
  msgid "<b>Additional authors:</b>%s"
! msgstr "<b>Auteurs secondaires:</b>%s"
  
  #. For the first occurrence, 
***************
*** 1966,1970 ****
  #~ msgid "ISBD : %s" 
  #~ msgstr "ISBD : %s"
- msgid ""
- msgstr ""
- 
--- 1965,1966 ----




From acli at users.sourceforge.net  Sun Jan 23 07:17:07 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:07 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,NONE,1.1.2.1
Message-ID: <E1Csb3b-0004iD-ID@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18025

Added Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Translation progress statistics script borrowed from gaim


--- NEW FILE ---
#!/usr/bin/perl

# Copyright 2003-2004 Nathan Walp <faceprint at faceprint.com>
# Adapted for Koha by Ambrose Li <acli at ada.dhs.org>
#
# This program 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.
#
# This program 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 this program; if not, write to the Free Software
# Foundation, Inc., 50 Temple Place, Suite 330, Boston, MA 02111-1307  USA
#


my $PACKAGE="koha";


use Locale::Language;

$lang{en_AU} = "English (Australian)";
$lang{en_CA} = "English (Canadian)";
$lang{en_GB} = "English (British)";
$lang{es_AR} = "Spanish (Argentinian)";
$lang{fr_FR} = "French"; # FIXME: should be just "fr"
$lang{my_MM} = "Burmese (Myanmar)";
$lang{pl_PL} = "Polish"; # FIXME: should be just "pl"
$lang{pt_BR} = "Portuguese (Brazilian)";
$lang{'sr at Latn'} = "Serbian (Latin)";
$lang{zh_CN} = "Chinese (Simplified)";
$lang{zh_TW} = "Chinese (Traditional)";

$ENV{LANG} = $ENV{LC_ALL} = 'C';

opendir(DIR, ".") || die "can't open directory: $!";
@pos = grep { /\.po$/ && -f } readdir(DIR);
foreach (@pos) { s/\.po$//; };
closedir DIR;

@pos = sort @pos;

$now = `date`;

#system("./update.pl --pot > /dev/null");

print "<html>\n";
print "<head><title>$PACKAGE i18n statistics</title></head>\n";
print "<body>\n";

opendir(DIR, ".") || die "can't open directory: $!";
@templates = grep { /\.pot$/ && -f } readdir(DIR);
foreach (@templates) { s/\.pot$//; };
closedir DIR;
for my $PACKAGE (sort {
	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
	    $module1 cmp $module2 && $theme1 cmp $theme2
	} @templates) {
    my @pos_orig = @pos;
    my @pos = grep { /^${PACKAGE}_/ } @pos_orig;
    my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;

$_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;

die "unable to get total: $!" unless (/(\d+) untranslated messages/);

$total = $1;

print "<h1>Module $module, theme $theme</h1>\n";
print "<table cellspacing='0' cellpadding='0' border='0' bgcolor='#888888' width='100%'><tr><td><table cellspacing='1' cellpadding='2' border='0' width='100%'>\n";

print"<tr bgcolor='#e0e0e0'><th>language</th><th style='background: #339933;'>trans</th><th style='background: #339933;'>%</th><th style='background: #333399;'>fuzzy</th><th style='background: #333399;'>%</th><th style='background: #dd3333;'>untrans</th><th style='background: #dd3333;'>%</th><th>&nbsp;</th></tr>\n";

foreach $index (0 .. $#pos) {
	$trans = $fuzz = $untrans = 0;
	$po = $pos[$index];
	next if $po =~ /_en_EN/; # Koha-specific
	print STDERR "$po..." if($ARGV[0] eq '-v');
	system("msgmerge $po.po $PACKAGE.pot -o $po.new 2>/dev/null");
	$_ = `msgfmt --statistics $po.new -o /dev/null 2>&1`;
	chomp;
	if(/(\d+) translated message/) { $trans = $1; }
	if(/(\d+) fuzzy translation/) { $fuzz = $1; }
	if(/(\d+) untranslated message/) { $untrans = $1; }
	$transp = 100 * $trans / $total;
	$fuzzp = 100 * $fuzz / $total;
	$untransp = 100 * $untrans / $total;
	if($index % 2) {
		$color = " bgcolor='#e0e0e0'";
	} else {
		$color = " bgcolor='#d0e0ff'";
	}
	my $lang = $1 if $po =~ /^${PACKAGE}_(.*)$/; # Koha-specific
	$name = "";
	$name = $lang{$lang}; # NOTE
	$name = code2language($lang) unless $name ne ""; # NOTE
	$name = "???" unless $name ne "";
	printf "<tr$color><td>%s(%s.po)</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>%d</td><td>%0.2f</td><td>",
	$name, $po, $trans, $transp, $fuzz, $fuzzp, $untrans, $untransp;
	printf "<img src='bar_g.gif' height='15' width='%0.0f' />", $transp*2
	unless $transp*2 < 0.5;
	printf "<img src='bar_b.gif' height='15' width='%0.0f' />", $fuzzp*2
	unless $fuzzp*2 < 0.5;
	printf "<img src='bar_r.gif' height='15' width='%0.0f' />", $untransp*2
	unless $untransp*2 < 0.5;
	print "</tr>\n";
	unlink("$po.new");
	print STDERR "done ($untrans untranslated strings).\n" if($ARGV[0] eq '-v');
}
print "</table></td></tr></table>\n";
print "Latest $PACKAGE.pot generated $now: <a href='$PACKAGE.pot'>$PACKAGE.pot</a><br />\n";
}
print "</body>\n";
print "</html>\n";





From acli at users.sourceforge.net  Sun Jan 23 07:17:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:17:54 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.1,1.1.2.2
Message-ID: <E1Csb4M-0004jp-MF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18197

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to re-enable update.pl


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** stats.pl	23 Jan 2005 06:17:05 -0000	1.1.2.1
--- stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
***************
*** 48,52 ****
  $now = `date`;
  
! #system("./update.pl --pot > /dev/null");
  
  print "<html>\n";
--- 48,52 ----
  $now = `date`;
  
! system("./update.pl --pot > /dev/null");
  
  print "<html>\n";




From acli at users.sourceforge.net  Sun Jan 23 07:22:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:22:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.4,1.1.2.5
Message-ID: <E1Csb8n-0004vm-AM@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18923

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
create fails if the pot file already exists


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -r1.1.2.4 -r1.1.2.5
*** update.pl	23 Jan 2005 05:16:15 -0000	1.1.2.4
--- update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
***************
*** 48,51 ****
--- 48,52 ----
        #
        my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
+       rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
  	    '-i', "../../koha-tmpl/$module-tmpl/$theme/en/",




From acli at users.sourceforge.net  Sun Jan 23 07:49:11 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 22:49:11 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator xgettext.pl,1.13,1.13.2.1
Message-ID: <E1CsbYd-0006NV-7x@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24427

Modified Files:
      Tag: rel_2_2
	xgettext.pl 
Log Message:
I think I know where the spurious leading spaces are from now
But there is no fix yet


Index: xgettext.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/xgettext.pl,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** xgettext.pl	30 Dec 2004 06:48:20 -0000	1.13
--- xgettext.pl	23 Jan 2005 06:49:08 -0000	1.13.2.1
***************
*** 462,468 ****
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! It sometimes generates strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.  The cause of this is not yet known.
  
  =cut
--- 462,469 ----
  when tmpl_process3.pl calls msgmerge(1) to update the PO file.
  
! If a Javascript string has leading spaces, it will
! generate strings with spurious leading spaces,
  leading to failure to match the strings when actually generating
! translated files.
  
  =cut




From acli at users.sourceforge.net  Sun Jan 23 08:05:51 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 22 Jan 2005 23:05:51 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35,1.35.2.1
Message-ID: <E1Csbol-0007Ab-Fk@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27541

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
This should fix bug 913


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -C2 -r1.35 -r1.35.2.1
*** TmplTokenizer.pm	30 Dec 2004 06:53:13 -0000	1.35
--- TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,353 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;
--- 349,354 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Sun Jan 23 09:16:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:16:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po update.pl,1.1.2.5,1.1.2.6
Message-ID: <E1Cscvb-000249-TY@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7900

Modified Files:
      Tag: rel_2_2
	update.pl 
Log Message:
Forgot a _ in the po file filename


Index: update.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/update.pl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -r1.1.2.5 -r1.1.2.6
*** update.pl	23 Jan 2005 06:22:26 -0000	1.1.2.5
--- update.pl	23 Jan 2005 08:16:57 -0000	1.1.2.6
***************
*** 47,51 ****
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),
--- 47,51 ----
        # but this is not Koha's convention.
        #
!       my $target = "po/${theme}_${module}" . ($pot_p? ".pot": "_$lang.po");
        rename($target, "$target~") if $pot_p;
        exec('./tmpl_process3.pl', ($pot_p? 'create': 'update'),




From acli at users.sourceforge.net  Sun Jan 23 09:17:29 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:17:29 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4,1.4.2.1 default_intranet_zh_TW.po,1.4,1.4.2.1
Message-ID: <E1Cscw5-00026C-9s@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7991

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Partial updates


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** css_opac_zh_TW.po	30 Dec 2004 09:37:19 -0000	1.4
--- css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2004-12-30 02:06-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
[...2271 lines suppressed...]
+ #~ msgstr "%s (%s??????)"
+ 
  #~ msgid "%s <b>acquired in the last %S days</b>"
  #~ msgstr "<b>??????%2$S???????????????</b>%1$s"
  
+ #~ msgid "%s(%s books)"
+ #~ msgstr "%s(%s??????)"
+ 
  #~ msgid "<b>ISBN:</b><a1>%s</a>"
  #~ msgstr "<b>?????????????????????</b><a1>%s</a>"
***************
*** 2089,2095 ****
  #~ msgstr "???????????????"
  
- #~ msgid "text/html; charset=iso-8859-1"
- #~ msgstr "text/html; charset=UTF-8"
- 
  #~ msgid "to Koha"
  #~ msgstr "Koha"
--- 2209,2212 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** default_intranet_zh_TW.po	30 Dec 2004 10:29:28 -0000	1.4
--- default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2004-12-30 04:23-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...5497 lines suppressed...]
***************
*** 21830,21833 ****
--- 21960,21966 ----
  #~ msgstr "?????????%s????????????%s"
  
+ #~ msgid "Pierre Cauchois (Esiee School)"
+ #~ msgstr "Pierre Cauchois (ESIEE??????)"
+ 
  #~ msgid "Previous"
  #~ msgstr "?????????"
***************
*** 21843,21849 ****
  #~ msgstr "????????????"
  
- #~ msgid "Rachel Hamilton-Williams, General Manager (Webmistress)"
- #~ msgstr "Rachel Hamilton-Williams (???????????????????????????)"
- 
  #  NOTE ???????????? by Arthur
  #  NOTE ???????????? by Ambrose
--- 21976,21979 ----




From acli at users.sourceforge.net  Sun Jan 23 09:59:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 00:59:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po stats.pl,1.1.2.2,1.1.2.3
Message-ID: <E1Csdav-00042t-MA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15497

Modified Files:
      Tag: rel_2_2
	stats.pl 
Log Message:
Forgot to remove some other debugging code
Fixed the sorting order


Index: stats.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/Attic/stats.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** stats.pl	23 Jan 2005 06:17:52 -0000	1.1.2.2
--- stats.pl	23 Jan 2005 08:59:39 -0000	1.1.2.3
***************
*** 61,65 ****
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    $module1 cmp $module2 && $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
--- 61,65 ----
  	    my($theme1, $module1) = ($1, $2) if $a =~ /^(.*)_([^_]+)$/;
  	    my($theme2, $module2) = ($1, $2) if $b =~ /^(.*)_([^_]+)$/;
! 	    return $module1 cmp $module2 || $theme1 cmp $theme2
  	} @templates) {
      my @pos_orig = @pos;
***************
*** 67,71 ****
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1 |tee zz`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);
--- 67,71 ----
      my($theme, $module) = ($1, $2) if $PACKAGE =~ /^(.*)_([^_]+)$/;
  
! $_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1`;
  
  die "unable to get total: $!" unless (/(\d+) untranslated messages/);




From acli at users.sourceforge.net  Sun Jan 23 11:51:21 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 02:51:21 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator tmpl_process3.pl,1.20,1.20.2.1
Message-ID: <E1CsfKz-0001ng-IF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6839

Modified Files:
      Tag: rel_2_2
	tmpl_process3.pl 
Log Message:
Make the generated pot file (i.e., result of "create") look more "real",
but using msgmerge to reformat the output


Index: tmpl_process3.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/tmpl_process3.pl,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -r1.20 -r1.20.2.1
*** tmpl_process3.pl	10 Mar 2004 07:00:28 -0000	1.20
--- tmpl_process3.pl	23 Jan 2005 10:51:16 -0000	1.20.2.1
***************
*** 263,276 ****
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph, $tmpfile) = tmpnam();
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph "$input\n";
      }
!     close $tmph;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile, '-o', $str_file);
!     warn_normal "Text extraction failed: $xgettext: $!\n", undef if $st != 0;
! #   unlink $tmpfile || warn_normal "$tmpfile: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {
--- 263,301 ----
      }
      die "$str_file: Output file already exists\n" if -f $str_file;
!     my($tmph1, $tmpfile1) = tmpnam();
!     my($tmph2, $tmpfile2) = tmpnam();
!     close $tmph2; # We just want a name
      # Generate the temporary file that acts as <MODULE>/POTFILES.in
      for my $input (@in_files) {
! 	print $tmph1 "$input\n";
      }
!     close $tmph1;
      # Generate the specified po file ($str_file)
!     $st = system ($xgettext, '-s', '-f', $tmpfile1, '-o', $tmpfile2);
!     # Run msgmerge so that the pot file looks like a real pot file
!     # We need to help msgmerge a bit by pre-creating a dummy po file that has
!     # the headers and the "" msgid & msgstr. It will fill in the rest.
!     if ($st == 0) {
! 	# Merge the temporary "pot file" with the specified po file ($str_file)
! 	# FIXME: msgmerge(1) is a Unix dependency
! 	# FIXME: need to check the return value
! 	unless (-f $str_file) {
! 	    local(*INPUT, *OUTPUT);
! 	    open(INPUT, "<$tmpfile2");
! 	    open(OUTPUT, ">$str_file");
! 	    while (<INPUT>) {
! 		print OUTPUT;
! 	    last if /^\n/s;
! 	    }
! 	    close INPUT;
! 	    close OUTPUT;
! 	}
! 	$st = system('msgmerge', '-U', '-s', $str_file, $tmpfile2);
!     } else {
! 	error_normal "Text extraction failed: $xgettext: $!\n", undef;
! 	error_additional "Will not run msgmerge\n", undef;
!     }
! #   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
! #   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
  
  } elsif ($action eq 'update') {




From acli at users.sourceforge.net  Mon Jan 24 03:47:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 18:47:49 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1CsuGb-0007dh-3v@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29279

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Partial update. This should be reasonably "finished".


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** css_opac_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
***************
*** 223,227 ****
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "???<a1>%s???????????????</a>??????<a2>??????</a>???"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
--- 223,227 ----
  #, c-format
  msgid "<a1> %s home </a> <a2> Log Out </a>"
! msgstr "<a1>%s ???????????????</a>???<a2>??????</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1> ?????? </a> <a2> ?????? </a> <a3> ISBD </a> <a4> ????????????????????? </a> "
! "<a5> ?????? </a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>??????</a>???<a2>??????</a>???<a3>ISBD</a>???<a4>?????????????????????</a>???"
! "<a5>??????</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 614,624 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
--- 614,625 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:179
  msgid "A free can be managed by any user."
! msgstr "???????????????????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:93
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:178
  msgid "A public can be seen by everybody, but managed only by you."
! msgstr "????????????????????????????????????????????????????????????????????????"
  
+ #  FIXME grammatical mistake in original ("every words")
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:147
  msgid ""
***************
*** 628,631 ****
--- 629,633 ----
  "will be discarded."
  msgstr ""
+ "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????the two towers????????????????????????????????????????????????two?????????tower?????????????????????????????????the????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 649,656 ****
  msgstr "????????????"
  
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr ""
  
  #. INPUT type=submit
--- 651,659 ----
  msgstr "????????????"
  
+ #  NOTE???Items???????????????????????????????????????????????????????????????????????????????????????
  #. INPUT type=submit
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:41
  msgid "Add Checked Items to Biblio Basket"
! msgstr "??????????????????????????????"
  
  #. INPUT type=submit
***************
*** 679,683 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
--- 682,686 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:30
  msgid "Add to basket"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:8
***************
*** 716,722 ****
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
- #, fuzzy
  msgid "Any word"
! msgstr "?????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
--- 719,724 ----
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:13
  msgid "Any word"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:86
***************
*** 783,803 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "Biblio(s) added"
! msgstr "????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
--- 785,805 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Basket is empty"
! msgstr "???????????????"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio added to the basket"
! msgstr "????????????????????????"
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:44
  msgid "Biblio basket"
! msgstr "??????"
  
+ # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "Biblio(s) added"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
***************
*** 881,887 ****
  msgstr "?????????%s"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
--- 883,890 ----
  msgstr "?????????%s"
  
+ #  NOTE ?????????????????????????????? (shelfbookcount)
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:110
  msgid "Content size"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:30
***************
*** 931,940 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr ""
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr ""
  
  # NOTE ???????????? by Arthur
--- 934,943 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to empty the basket ?"
! msgstr "?????????????????????"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:19
  msgid "Do you want to remove selected biblios ?"
! msgstr "??????????????????????????????"
  
  # NOTE ???????????? by Arthur
***************
*** 968,974 ****
  "???????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
--- 971,978 ----
  "???????????????????????????"
  
+ #  NOTE
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:39
  msgid "Filter on"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-account.tmpl:9
***************
*** 986,990 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
--- 990,994 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:17
  msgid "Free"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl:61
***************
*** 996,1000 ****
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
--- 1000,1004 ----
  #, c-format
  msgid "Hi, Here is the biblio basket sent by %s"
! msgstr "??????????????? %s ???????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:138
***************
*** 1034,1037 ****
--- 1038,1042 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
+ "????????????????????????????????????????????????????????????*????????????%???????????????????????????two tower*???????????????the two towers?????????two white towers?????????a tower and two cities???"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1195,1199 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
--- 1200,1204 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "No biblio selected"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:6
***************
*** 1244,1248 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr ""
  
  # NOTE ???????????? by Arthur
--- 1249,1253 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-basket-top.inc:6
  msgid "OPAC Basket"
! msgstr "??????????????????"
  
  # NOTE ???????????? by Arthur
***************
*** 1273,1285 ****
  msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
- #, fuzzy
  msgid "Partial search"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
--- 1278,1290 ----
  msgstr "????????????"
  
+ #  NOTE ??????
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:84
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:157
  msgid "Owner"
! msgstr "??????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:146
  msgid "Partial search"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-auth.tmpl:29
***************
*** 1329,1337 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
--- 1334,1342 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:15
  msgid "Private"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:9
  msgid "Problem sending the basket..."
! msgstr "????????????????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:88
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
--- 1346,1350 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:16
  msgid "Public"
! msgstr "?????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:131
***************
*** 1514,1519 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr ""
  
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
--- 1519,1525 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasketform.tmpl:4
  msgid "Sending the basket"
! msgstr "???????????????"
  
+ #  FIXME ?????????????????????????????????????????????
  #. A
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-ISBDdetail.tmpl:25
***************
*** 1521,1525 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=serial
--- 1527,1531 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:26
  msgid "Serial issues"
! msgstr "????????????"
  
  #. %1$s: TMPL_VAR name=serial
***************
*** 1536,1540 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
--- 1542,1546 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:93
  msgid "Set Filter"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:8
***************
*** 1651,1655 ****
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=reservecount
--- 1657,1661 ----
  #, c-format
  msgid "The basket was sent to: %s"
! msgstr "??????????????????%s"
  
  #. %1$s: TMPL_VAR name=reservecount
***************
*** 1671,1675 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
--- 1677,1681 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "This biblio is already in the basket"
! msgstr "???????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:13
***************
*** 1867,1871 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
--- 1873,1877 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:2
  msgid "Your biblio basket"
! msgstr "????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-userupdate.tmpl:6
***************
*** 1876,1890 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr ""
  
- # NOTE This refers to new books acquired in the last so-and-so days
- # NOTE This is essentially the same string as the next, but different
- # NOTE due to technical difficulties (in creating an msgid from the HTML)
- # FIXME This string as it is is nearly untranslatable. The scanner need to be fixed.
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid "already in the basket"
! msgstr ""
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
--- 1882,1891 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:177
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "?????????????????????????????????????????????????????????"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid "already in the basket"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:98
***************
*** 1925,1931 ****
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
- #, fuzzy
  msgid "in"
! msgstr "????????????"
  
  #. IMG
--- 1926,1931 ----
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl:52
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-sendbasket.tmpl:21
  msgid "in"
! msgstr "???"
  
  #. IMG
***************
*** 2055,2061 ****
  #~ msgstr "<b>?????????????????????</b><a1>%s</a>"
  
- #~ msgid "<em><a1>%s (%s)</a></em>"
- #~ msgstr "<em><a1>%s (%s)</a></em>"
- 
  #~ msgid "AMOUNT"
  #~ msgstr "??????"
--- 2055,2058 ----
***************
*** 2064,2073 ****
  #~ msgstr "??????????????????"
  
- #~ msgid "Apr"
- #~ msgstr "??????"
- 
- #~ msgid "Aug"
- #~ msgstr "??????"
- 
  #~ msgid "Compact Disc"
  #~ msgstr "??????"
--- 2061,2064 ----
***************
*** 2077,2086 ****
  #~ msgstr "????????????"
  
- #~ msgid "Day"
- #~ msgstr "???"
- 
- #~ msgid "Dec"
- #~ msgstr "?????????"
- 
  #~ msgid "Easy / Picture Books"
  #~ msgstr "??????/?????????"
--- 2068,2071 ----
***************
*** 2100,2118 ****
  #~ msgstr "???????????????"
  
- #~ msgid "Feb"
- #~ msgstr "??????"
- 
  #~ msgid "Illustrator"
  #~ msgstr "??????"
  
- #~ msgid "Jan"
- #~ msgstr "??????"
- 
- #~ msgid "Jul"
- #~ msgstr "??????"
- 
- #~ msgid "Jun"
- #~ msgstr "??????"
- 
  # NOTE ???????????? by Arthur
  #~ msgid "Junior Fiction"
--- 2085,2091 ----
***************
*** 2123,2138 ****
  #~ msgstr "??????/???????????????"
  
- #~ msgid "KOHA"
- #~ msgstr "KOHA"
- 
  #~ msgid "KOHA: OPAC Catalogue Search"
  #~ msgstr "KOHA???????????????"
  
- #~ msgid "Log In to Koha"
- #~ msgstr "??????Koha"
- 
- #~ msgid "Mar"
- #~ msgstr "??????"
- 
  #~ msgid "Next Page"
  #~ msgstr "?????????"
--- 2096,2102 ----
***************
*** 2155,2161 ****
  #~ "?????????"
  
- #~ msgid "Nov"
- #~ msgstr "?????????"
- 
  #~ msgid "OR :"
  #~ msgstr "??????"
--- 2119,2122 ----
***************
*** 2164,2170 ****
  #~ msgstr "????????????????????????"
  
- #~ msgid "Oct"
- #~ msgstr "??????"
- 
  #~ msgid "Previous Page"
  #~ msgstr "?????????"
--- 2125,2128 ----
***************
*** 2186,2192 ****
  #~ msgstr "??????"
  
- #~ msgid "Sep"
- #~ msgstr "??????"
- 
  # NOTE ???????????? by Arthur
  #~ msgid "Something new ?"
--- 2144,2147 ----
***************
*** 2208,2212 ****
  #~ msgid "Young Adult Fiction"
  #~ msgstr "???????????????"
- 
- #~ msgid "to Koha"
- #~ msgstr "Koha"
--- 2163,2164 ----




From acli at users.sourceforge.net  Mon Jan 24 05:43:23 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:43:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1,1.1.2.1
Message-ID: <E1Csw4R-0006ip-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25795

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling corrections


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_126a.tmpl	7 Jun 2004 10:04:00 -0000	1.1
--- unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
***************
*** 498,502 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 498,502 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 584,588 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 584,588 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 670,674 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 670,674 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 756,760 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 756,760 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 842,846 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 842,846 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

***************
*** 928,932 ****
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements hitoriques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>

--- 928,932 ----
  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13j" -->

! 				<option value="j" SELECTED>Autres renseignements historiques</option>

  			<!-- TMPL_ELSE -->

  				<option value="j">Autres renseignements historiques</option>





From acli at users.sourceforge.net  Mon Jan 24 05:45:27 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 20:45:27 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.1,1.4.2.2
Message-ID: <E1Csw6R-0006rD-F7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26187

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial updates, mostly Unimarc stuff
(CMARC seems to be mostly identical to French Unimarc)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -r1.4.2.1 -r1.4.2.2
*** default_intranet_zh_TW.po	23 Jan 2005 08:17:24 -0000	1.4.2.1
--- default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
***************
*** 141,145 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr ""
  
  #. For the first occurrence,
--- 141,145 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e'...)"
! msgstr "%S (??? 200a ?????????????????????200c?????????200d?????????200e?????????)"
  
[...961 lines suppressed...]
--- 3685,3690 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:369
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_141.tmpl:371
  msgid "Autre"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:218
***************
*** 3863,3867 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500
--- 3868,3872 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:932
  msgid "Autres renseignements historiques"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:500




From acli at users.sourceforge.net  Mon Jan 24 06:43:12 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:43:12 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_126a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1Csx0K-00028G-Da@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8182

Modified Files:
      Tag: rel_2_2
	unimarc_field_126a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_126a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_126a.tmpl	24 Jan 2005 04:43:20 -0000	1.1.2.1
--- unimarc_field_126a.tmpl	24 Jan 2005 05:43:10 -0000	1.1.2.2
***************
*** 490,494 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

--- 490,494 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f8i" -->

***************
*** 576,580 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

--- 576,580 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f9i" -->

***************
*** 662,666 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

--- 662,666 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f10i" -->

***************
*** 748,752 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

--- 748,752 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f11i" -->

***************
*** 834,838 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

--- 834,838 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f12i" -->

***************
*** 920,924 ****
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignement techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->

--- 920,924 ----
  				<option value="h" SELECTED>Renseignements techniques sur la musique</option>

  			<!-- TMPL_ELSE -->

! 				<option value="h">Renseignements techniques sur la musique</option>

  			<!-- /TMPL_IF -->

  			<!-- TMPL_IF name="f13i" -->





From acli at users.sourceforge.net  Mon Jan 24 06:53:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 21:53:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.2,1.4.2.3 default_intranet_zh_TW.po,1.4.2.2,1.4.2.3
Message-ID: <E1CsxA2-0002fc-7C@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
126a mostly done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** css_opac_zh_TW.po	24 Jan 2005 02:47:44 -0000	1.4.2.2
--- css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 239,244 ****
  "<a5> Print </a>"
  msgstr ""
! "<a1>??????</a>???<a2>??????</a>???<a3>ISBD</a>???<a4>?????????????????????</a>???"
! "<a5>??????</a>"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 239,244 ----
  "<a5> Print </a>"
  msgstr ""
! "<a1>??????</a>???<a2>??????</a>???<a3>ISBD</a>???<a4>?????????????????????</a>???<a5>??????</"
! "a>"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 629,633 ****
  "will be discarded."
  msgstr ""
! "???????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????the two towers????????????????????????????????????????????????two?????????tower?????????????????????????????????the????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
--- 629,635 ----
  "will be discarded."
  msgstr ""
! "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
! "?????????????????????the two towers????????????????????????????????????????????????two?????????tower???"
! "??????????????????????????????the????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-suggestions.tmpl:62
***************
*** 1038,1042 ****
  "towers\", \"a tower and two cities\""
  msgstr ""
! "????????????????????????????????????????????????????????????*????????????%???????????????????????????two tower*???????????????the two towers?????????two white towers?????????a tower and two cities???"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
--- 1040,1046 ----
  "towers\", \"a tower and two cities\""
  msgstr ""
! "????????????????????????????????????????????????????????????*????????????%???????????????????????????two "
! "tower*???????????????the two towers?????????two white towers?????????a tower and two "
! "cities???"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-reserve.tmpl:5
***************
*** 1411,1416 ****
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "????????????????????????????????????????????????????????????????????? Victor Hugo????????????????????????????????????"
! "??????????????????????????? CNRS??????????????????????????????"
  
  #  NOTE???Items???????????????????????????????????????????????????????????????????????????????????????
--- 1415,1420 ----
  "company, group, collective author (CNRS, Library of Congress)"
  msgstr ""
! "????????????????????????????????????????????????????????????????????? Victor Hugo???????????????????????????"
! "???????????????????????????????????? CNRS??????????????????????????????"
  
  #  NOTE???Items???????????????????????????????????????????????????????????????????????????????????????
***************
*** 1501,1505 ****
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
--- 1505,1510 ----
  "branch. By default the search is done on every branches of the library"
  msgstr ""
! "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
! "??????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-addbookbybiblionumber.tmpl:6
***************
*** 1815,1819 ****
  "illustrator...)"
  msgstr ""
! "????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9
--- 1820,1825 ----
  "illustrator...)"
  msgstr ""
! "??????????????????????????????????????????????????????????????????????????????????????????????????????????????????"
! "??????????????????"
  
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-searchresults.tmpl:9

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -C2 -r1.4.2.2 -r1.4.2.3
*** default_intranet_zh_TW.po	24 Jan 2005 04:45:21 -0000	1.4.2.2
--- default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 02:04-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
[...1012 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
--- 18929,18933 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:171
  msgid "Type de son:"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:406
***************
*** 19568,19572 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338
--- 19547,19551 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:65
  msgid "Vitesse:"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:338




From acli at users.sourceforge.net  Mon Jan 24 07:32:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:32:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.3,1.4.2.4
Message-ID: <E1Csxly-0004vE-Hg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18639

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
126b done (i.e., translations that can be copied from CMARC have been copied)


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** default_intranet_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
***************
*** 1077,1081 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
--- 1077,1081 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:294
  msgid "10 cm x 6.3 cm ou 3 pouces 7/8 x 2 pouces 1/2"
! msgstr "3 7/8 ?? 2 1/2 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:125
***************
*** 1156,1164 ****
  msgstr "2 ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
- #, fuzzy
  msgid "2 pouces"
! msgstr "-> ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
--- 1156,1164 ----
  msgstr "2 ??????"
  
+ #  TODO CMARC ??? f6e ??????1 ???????????????1 ????????? f6c???CMARC ????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:353
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:355
  msgid "2 pouces"
! msgstr "2 ???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:36
***************
*** 3993,3997 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
--- 3993,3997 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:30
  msgid "Bande \"Master\""
! msgstr "?????? (master tape)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:33
***************
*** 4075,4083 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
--- 4075,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:33
  msgid "Bande reproduite a partir du \"master\""
! msgstr "???????????? (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:35
  msgid "Bande reproduite a partir du master"
! msgstr "???????????? (tape duplication master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:189
***************
*** 5685,5689 ****
  #, fuzzy
  msgid "Codage CX"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
--- 5685,5689 ----
  #, fuzzy
  msgid "Codage CX"
! msgstr "CX ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:117
***************
*** 6372,6376 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
--- 6372,6376 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:45
  msgid "Cylindre"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:697
***************
*** 7016,7020 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
--- 7016,7020 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:40
  msgid "Disque \"pere\" (negatif)"
! msgstr "??????????????? (disc master, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:171
***************
*** 7133,7137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
--- 7133,7137 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:131
  msgid "Dos papier"
! msgstr "?????? (paper backed)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl:76
***************
*** 8632,8646 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
--- 8632,8646 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:20
  msgid "Gravure directe"
! msgstr "?????????????????????????????????(instantaneous)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:170
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:172
  msgid "Gravure inconnue"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:160
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:162
  msgid "Gravure laterale ou combinee"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1038
***************
*** 8683,8693 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
- #, fuzzy
  msgid "Grec"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
--- 8683,8692 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:167
  msgid "Gravure verticale"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:607
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:609
  msgid "Grec"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:786
***************
*** 8696,8700 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
--- 8695,8699 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1063
  msgid "Greenwich (G.B.)"
! msgstr "????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:78
***************
*** 8718,8721 ****
--- 8717,8721 ----
  "Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine"
  msgstr ""
+ "Gynn Lomax???Richard Anderson???Jeremy Blake???Rebecca Holden???Olive T. Canine"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:66
***************
*** 8724,8730 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
- #, fuzzy
  msgid "HELP Ordering"
! msgstr "???????????????"
  
  #  NOTE ???????????? by Arthur
--- 8724,8729 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:74
  msgid "HELP Ordering"
! msgstr "????????????"
  
  #  NOTE ???????????? by Arthur
***************
*** 8744,8753 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
- #, fuzzy
  msgid "HINT for issues"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
--- 8743,8751 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:8
  msgid "HINT for fines"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:5
  msgid "HINT for issues"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:8
***************
*** 10632,10638 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
- #, fuzzy
  msgid "Laque"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
--- 10630,10635 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:106
  msgid "Laque"
! msgstr "lacquered????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:216
***************
*** 11496,11500 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
--- 11493,11497 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:50
  msgid "Matrice (negatif)"
! msgstr "????????? (stamper, negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1417
***************
*** 11504,11510 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
- #, fuzzy
  msgid "May"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
--- 11501,11506 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:112
  msgid "May"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:208
***************
*** 11720,11726 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
- #, fuzzy
  msgid "Metal"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
--- 11716,11721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:109
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:111
  msgid "Metal"
! msgstr "????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:329
***************
*** 11736,11740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
--- 11731,11735 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:126
  msgid "Metal et plastique"
! msgstr "?????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1219
***************
*** 13197,13203 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
- #, fuzzy
  msgid "Nord"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
--- 13192,13197 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_123g.tmpl:30
  msgid "Nord"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:176
***************
*** 13220,13233 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
--- 13214,13229 ----
  msgstr ""
  
+ #  NOTE ?????????CMARC ????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1012
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1014
  msgid "Norme CCIR/IEC"
! msgstr "CCIR/IEC ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:407
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:410
  msgid "Norme ISO pour la translitteration"
! msgstr "ISO "
  
+ #  NOTE ?????????CMARC ????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1007
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1009
***************
*** 13463,13466 ****
--- 13459,13463 ----
  msgstr ""
  
+ #  NOTE ?????????CMARC ????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:981
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:983
***************
*** 13468,13475 ****
  msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
--- 13465,13473 ----
  msgstr "??????"
  
+ #  NOTE ?????????CMARC ????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1022
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:1024
  msgid "Numerique (disque compact)"
! msgstr "????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:26
***************
*** 14089,14093 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
--- 14087,14091 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:141
  msgid "P.V.C."
! msgstr "?????? (PVC)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/jmemberentry.tmpl:25
***************
*** 14105,14116 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
- #, fuzzy
  msgid "Page Size"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
- #, fuzzy
  msgid "Page Type"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
--- 14103,14112 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:134
  msgid "Page Size"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:32
  msgid "Page Type"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/marcimport/marcimportdetail.tmpl:36
***************
*** 14778,14781 ****
--- 14774,14778 ----
  msgstr ""
  
+ #  NOTE CMARC 126b ??? 2h
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:365
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:367
***************
*** 14787,14791 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
--- 14784,14788 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:101
  msgid "Plastique"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:662
***************
*** 14961,14965 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
--- 14958,14962 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:146
  msgid "Polyester"
! msgstr "????????? (polyester)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:743
***************
*** 15132,15139 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15129,15137 ----
  msgstr ""
  
+ #  FIXME Clash between 126a and 130!!
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:9
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "?????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15150,15164 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr ""
  
  # FIXME This may be wrong. check context.
--- 15148,15162 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:55
  msgid "Pressage de test"
! msgstr "????????? (test pressing)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:114
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:116
  msgid "Pressage laque"
! msgstr "????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:119
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:121
  msgid "Pressage plastique"
! msgstr "????????????????????????????????????"
  
  # FIXME This may be wrong. check context.
***************
*** 15242,15246 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
--- 15240,15244 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:25
  msgid "Production industrielle"
! msgstr "???????????????????????????????????????????????????(mass produced)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_124b.tmpl:43
***************
*** 18891,18895 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
--- 18889,18893 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:9
  msgid "Type de disque, cylindre ou bande magnetique:"
! msgstr "?????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:9
***************
*** 18899,18903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
--- 18897,18901 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:70
  msgid "Type de document:"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_135a.tmpl:9
***************
*** 18911,18915 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9
--- 18909,18913 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:151
  msgid "Type de gravure:"
! msgstr "????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_125a.tmpl:9




From acli at users.sourceforge.net  Mon Jan 24 07:53:56 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 22:53:56 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Csy6m-00067h-As@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23504

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** default_intranet_zh_TW.po	24 Jan 2005 06:32:21 -0000	1.4.2.4
--- default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
***************
*** 19653,19659 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
- #, fuzzy
  msgid "Waited"
! msgstr "??????"
  
  #. INPUT type=submit
--- 19653,19658 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:39
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:161
  msgid "Waited"
! msgstr "??????"
  
  #. INPUT type=submit
***************
*** 19786,19794 ****
  msgstr "???"
  
- # FIXME Bug in English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
- #, fuzzy
  msgid "Year"
! msgstr "???%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
--- 19785,19791 ----
  msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:122
  msgid "Year"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:136
***************
*** 20023,20030 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
- #, fuzzy
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "?????????????????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
--- 20020,20027 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:95
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:180
  msgid "a private bookshelf is managed by you &amp; can be seen only by you."
! msgstr "??????????????????????????????????????????????????????????????????"
  
+ #  FIXME bug in tokenizer/scanner
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:23
***************
*** 20053,20056 ****
--- 20050,20054 ----
  "Thompson,"
  msgstr ""
+ "??? Simon Blake??????????????? Amanda Atkins???Olwen Williams???Finlay Thompson???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:90
***************
*** 20088,20094 ****
  msgstr "???????????? <i>(%s)</i>"
  
- #  XXX ????????????????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/authorities/authorities.tmpl:1
- #, fuzzy
  msgid "authority help"
  msgstr "????????????"
--- 20086,20090 ----
***************
*** 20101,20107 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
- #, fuzzy
  msgid "autre"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
--- 20097,20102 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:414
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:416
  msgid "autre"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:454
***************
*** 20127,20131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "?????????-1?????? (????????????)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
--- 20122,20126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:110
  msgid "be in tab -1"
! msgstr "?????????-1????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:109
***************
*** 20216,20222 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
- #, fuzzy
  msgid "catalogue details"
! msgstr "????????????"
  
  #. For the first occurrence,
--- 20211,20216 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:12
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:81
  msgid "catalogue details"
! msgstr "????????????"
  
  #. For the first occurrence,
***************
*** 20229,20235 ****
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
- #, fuzzy
  msgid "change status"
! msgstr "??????"
  
  #. SCRIPT
--- 20223,20228 ----
  #. INPUT type=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:42
  msgid "change status"
! msgstr "????????????"
  
  #. SCRIPT
***************
*** 20240,20246 ****
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, fuzzy, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr "%S - %s <a1>+</a>"
  
  #. INPUT type=reset name=reset
--- 20233,20239 ----
  #. %1$s: TMPL_VAR name=closedate
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl:46
! #, c-format
  msgid "closed on %s <a1>View</a>"
! msgstr ""
  
  #. INPUT type=reset name=reset
***************
*** 20276,20282 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
- #, fuzzy
  msgid "count"
! msgstr "??????"
  
  #. SCRIPT
--- 20269,20274 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:9
  msgid "count"
! msgstr "??????"
  
  #. SCRIPT
***************
*** 20286,20292 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
- #, fuzzy
  msgid "day"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
--- 20278,20283 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:12
  msgid "day"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl:4
***************
*** 20376,20380 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
--- 20367,20371 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/issuingrules.tmpl:21
  msgid "everywhere"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:18
***************
*** 20401,20407 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
- #, fuzzy
  msgid "filter"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
--- 20392,20397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:20
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:22
  msgid "filter"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:11
***************
*** 20412,20418 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, fuzzy, c-format
  msgid "for branch = %s"
! msgstr "??????????????????%s"
  
  #. %1$s: TMPL_VAR name=borrower_category
--- 20402,20408 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=borrower_category
***************
*** 20510,20514 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:25
- #, fuzzy
  msgid "ignored"
  msgstr "??????"
--- 20500,20503 ----
***************
*** 20669,20673 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
  msgid "mandatory tags empty"
  msgstr "????????????????????????"
--- 20658,20661 ----
***************
*** 20727,20733 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
- #, fuzzy
  msgid "month"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
--- 20715,20720 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:24
  msgid "month"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:310
***************
*** 20848,20852 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=name
--- 20835,20839 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl:9
  msgid "or add to a new bookshelf"
! msgstr "??????????????????????????????"
  
  #. %1$s: TMPL_VAR name=name
***************
*** 20881,20887 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
- #, fuzzy
  msgid "plans"
! msgstr "Al Banks"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
--- 20868,20873 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:331
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:333
  msgid "plans"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:22
***************
*** 20899,20903 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr ""
  
  #. SCRIPT
--- 20885,20889 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/quicksearch-top.inc:5
  msgid "popup"
! msgstr "????????????"
  
  #. SCRIPT
***************
*** 20952,20958 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
- #, fuzzy
  msgid "quarter"
! msgstr "??????"
  
  #. SCRIPT
--- 20938,20943 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:33
  msgid "quarter"
! msgstr "???"
  
  #. SCRIPT
***************
*** 21045,21051 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, fuzzy, c-format
  msgid "see also : %s,"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
--- 21030,21036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:108
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:133
! #, c-format
  msgid "see also : %s,"
! msgstr "?????????%s???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:22
***************
*** 21059,21065 ****
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, fuzzy, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1></a>%2$s ???????????? %1$s"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
--- 21044,21050 ----
  #. %2$s: TMPL_VAR name=name
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl:4
! #, c-format
  msgid "shopping Basket <b>%s </b>for <a1>%s</a>"
! msgstr "<a1>%2$s</a> ???????????? <b>%1$s</b>"
  
  # FIXME Strictly speaking untranslatable. Arguably a template bug, but difficult to fix
***************
*** 21090,21096 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
- #, fuzzy
  msgid "subfield ignored"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
--- 21075,21080 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl:104
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:127
  msgid "subfield ignored"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/auth_tag_structure.tmpl:155
***************
*** 21159,21163 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype????????????"
  
  #  NOTE ???????????? by Arthur
--- 21143,21147 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:53
  msgid "the biblioitems.itemtype field MUST :"
! msgstr "biblioitems.itemtype ????????????"
  
  #  NOTE ???????????? by Arthur
***************
*** 21185,21193 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch?????????"
  
  #  NOTE ???????????? by Arthur
--- 21169,21177 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:93
  msgid "the items.holdingbranch field MUST :"
! msgstr "items.holdingbranch ????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:79
  msgid "the items.homebranch field MUST :"
! msgstr "items.homebranch ?????????"
  
  #  NOTE ???????????? by Arthur
***************
*** 21289,21293 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
--- 21273,21277 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:15
  msgid "week"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:25
***************
*** 21309,21313 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16
--- 21293,21297 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/serial-issues.tmpl:39
  msgid "year"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:16




From acli at users.sourceforge.net  Mon Jan 24 08:13:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:13:57 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator TmplTokenizer.pm,1.35.2.1,1.35.2.2
Message-ID: <E1CsyQ9-0007JT-Mu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28051

Modified Files:
      Tag: rel_2_2
	TmplTokenizer.pm 
Log Message:
Reverting the patch


Index: TmplTokenizer.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/TmplTokenizer.pm,v
retrieving revision 1.35.2.1
retrieving revision 1.35.2.2
diff -C2 -r1.35.2.1 -r1.35.2.2
*** TmplTokenizer.pm	23 Jan 2005 07:05:43 -0000	1.35.2.1
--- TmplTokenizer.pm	24 Jan 2005 07:13:54 -0000	1.35.2.2
***************
*** 342,346 ****
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])\s*(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
--- 342,346 ----
  	    $state = $input[$i] eq parenleft ? STATE_PARENLEFT : 0;
  	} elsif ($state == STATE_PARENLEFT) {
! 	    if ($input[$i] =~ /^(['"])(.*)\1$/s) {
  		($state, $j, $q, $s) = (STATE_STRING_LITERAL, $#output, $1, $2);
  	    } else {
***************
*** 349,354 ****
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		my $candidate = $output[$j]->[1];
! 		$output[$j] = [1, $candidate, $q, $s];
  	    }
  	    $state = 0;
--- 349,353 ----
  	} elsif ($state == STATE_STRING_LITERAL) {
  	    if ($input[$i] eq parenright) {
! 		$output[$j] = [1, $output[$j]->[1], $q, $s];
  	    }
  	    $state = 0;




From acli at users.sourceforge.net  Mon Jan 24 08:57:40 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 23 Jan 2005 23:57:40 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.3,1.4.2.4 default_intranet_zh_TW.po,1.4.2.5,1.4.2.6
Message-ID: <E1Csz6S-0001Mu-6P@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5164

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po default_intranet_zh_TW.po 
Log Message:
Unimarc tag 130 done


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** css_opac_zh_TW.po	24 Jan 2005 05:53:09 -0000	1.4.2.3
--- css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
***************
*** 10,14 ****
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-23 23:45-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 10,14 ----
  msgstr ""
  "Project-Id-Version: Koha OPAC 2.2cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-18 02:40-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 18,21 ****
--- 18,28 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ # TODO
+ #. SCRIPT
+ #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
+ #, fuzzy
+ msgid " Biblio(s) added"
+ msgstr "??????????????????"
+ 
  #. %1$S: type=text name=value
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-search.tmpl:111
***************
*** 799,808 ****
  msgstr "??????"
  
- # TODO
- #. SCRIPT
- #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- msgid "Biblio(s) added"
- msgstr "??????????????????"
- 
  #: ../../koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl:51
  msgid "Bookshelves"
--- 806,809 ----

Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -C2 -r1.4.2.5 -r1.4.2.6
*** default_intranet_zh_TW.po	24 Jan 2005 06:53:51 -0000	1.4.2.5
--- default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
***************
*** 26,30 ****
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-23 23:46-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
--- 26,30 ----
  msgstr ""
  "Project-Id-Version: Koha INTRANET 2.1cvs\n"
! "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
  "Last-Translator: Ambrose Li <acli at ada.dhs.org>\n"
***************
*** 34,37 ****
--- 34,52 ----
  "Content-Transfer-Encoding: 8bit\n"
  
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory fields empty (see bold subfields)"
+ msgstr "???????????????????????????????????????????????????"
+ 
+ #. For the first occurrence,
+ #. SCRIPT
+ #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
+ #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
+ msgid " mandatory tags empty"
+ msgstr "????????????????????????"
+ 
  #. %1$s: TMPL_VAR name=subject
  #: ../../koha-tmpl/intranet-tmpl/default/en/maint/catmaintain.tmpl:6
***************
*** 81,85 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
--- 96,100 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:31
  msgid "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
! msgstr "#205||{ ; 205a}{ , 205b}{ = 205d}{ / 205f}{ ; 205g}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:32
***************
*** 91,95 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
--- 106,110 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:33
  msgid "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
! msgstr "#210|(|{210e}{(210f)}{ : 210g}{, 210h}|)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:34
***************
*** 107,111 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
--- 122,126 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:30
  msgid "#230||{ ; 230a}|"
! msgstr "#230||{ ; 230a}|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:36
***************
*** 117,121 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
--- 132,136 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:28
  msgid "#700|"
! msgstr "#700|"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/systempreferences.tmpl:37
***************
*** 135,139 ****
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr ""
  
  #. %1$S: type=text name=seealso
--- 150,154 ----
  #, c-format
  msgid "%S (example for 200a : '200c','200d','200e')"
! msgstr "%S (??? 200a ?????????????????????200c?????????200d?????????200e???)"
  
  #. %1$S: type=text name=seealso
***************
*** 736,740 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl:55
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:56
- #, fuzzy
  msgid "&nbsp;No results found."
  msgstr "?????????????????????????????????"
--- 751,754 ----
***************
*** 784,788 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:17
- #, fuzzy
  msgid ""
  "(Note : fines are calculated by the fines2.pl script, located in misc "
--- 798,801 ----
***************
*** 818,824 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, fuzzy, c-format
  msgid "(is %s)"
! msgstr "(%s, %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
--- 831,837 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:123
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:125
! #, c-format
  msgid "(is %s)"
! msgstr "(??? %s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:13
***************
*** 971,982 ****
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
- #, fuzzy
  msgid "1/2 Monthes"
! msgstr "??????%0.0s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
--- 984,994 ----
  # FIXME looks like a BUG in the English template
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:41
  msgid "1/2 Monthes"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:59
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:61
  msgid "1/2 months"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:338
***************
*** 989,993 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
--- 1001,1005 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:50
  msgid "1/2 quarters"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:44
***************
*** 995,999 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
--- 1007,1011 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:32
  msgid "1/2 weeks"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-add.tmpl:84
***************
*** 1001,1005 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "1/2 ???"
  
  # FIXME looks like a BUG in the English template
--- 1013,1017 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/subscription-detail.tmpl:56
  msgid "1/2 years"
! msgstr "??????"
  
  # FIXME looks like a BUG in the English template
***************
*** 1082,1086 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
--- 1094,1098 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:127
  msgid "105 mm (microfilm)"
! msgstr "105 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1296
***************
*** 1134,1138 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
--- 1146,1150 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:112
  msgid "16 mm (microfilm)"
! msgstr "16 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:414
***************
*** 1211,1215 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
--- 1223,1227 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:132
  msgid "3 x 5 pouces"
! msgstr "3 ?? 5 ??????8 ?? 13 ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:112
***************
*** 1236,1240 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
--- 1248,1252 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:117
  msgid "35 mm (microfilm)"
! msgstr "35 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:282
***************
*** 1251,1255 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
--- 1263,1267 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:137
  msgid "4 x 6 pouces"
! msgstr "4 ?? 6 ??????11 ?? 15 ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:164
***************
*** 1296,1300 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
--- 1308,1312 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:142
  msgid "6 x 9 pouces"
! msgstr "6 ?? 9 ??????16 ?? 23 ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:127
***************
*** 1331,1335 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
--- 1343,1347 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:122
  msgid "70 mm (microfilm)"
! msgstr "70 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:104
***************
*** 1341,1345 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
--- 1353,1357 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:107
  msgid "8 mm (microfilm)"
! msgstr "8 ????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:404
***************
*** 1358,1365 ****
  msgstr "8/10 ???/???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr ""
  
  #. For the first occurrence,
--- 1370,1378 ----
  msgstr "8/10 ???/???"
  
+ #  NOTE CMARC ?????? :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:145
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:147
  msgid "9 x 19 cm"
! msgstr "3 1/4 ?? 7 3/8 ??????9 ?? 19 ?????????????????????"
  
  #. For the first occurrence,
***************
*** 4066,4070 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
--- 4079,4083 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:55
  msgid "Bande microfilm"
! msgstr "??????????????? (microfilm slip)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:198
***************
*** 5019,5023 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
--- 5032,5036 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:20
  msgid "Carte a fenetre"
! msgstr "?????? (aperture card)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:1535
***************
*** 6070,6074 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
--- 6083,6087 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:313
  msgid "Copie de service"
! msgstr "????????? (service copy)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/request.tmpl:38
***************
*** 6156,6167 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
- #, fuzzy
  msgid "Couleur"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
- #, fuzzy
  msgid "Couleur:"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
--- 6169,6178 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:229
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:231
  msgid "Couleur"
! msgstr "?????? (color)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:215
  msgid "Couleur:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:119
***************
*** 6919,6923 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
--- 6930,6934 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:262
  msgid "Diazoique"
! msgstr "?????? (diazo)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:423
***************
*** 6957,6961 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
--- 6968,6972 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:96
  msgid "Dimensions:"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:168
***************
*** 7027,7033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
- #, fuzzy
  msgid "Divers"
! msgstr "-> ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
--- 7038,7043 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:239
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:241
  msgid "Divers"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:123
***************
*** 7405,7409 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
--- 7415,7419 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:183
  msgid "Elevee (31x - 60x)"
! msgstr "????????????31???60??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/imemberentry.tmpl:78
***************
*** 7424,7433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
--- 7434,7443 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:246
  msgid "Emulsion:"
! msgstr "???????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:275
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:277
  msgid "Emulsions diverses"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:611
***************
*** 7910,7916 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
- #, fuzzy
  msgid "Faible reduction"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
--- 7920,7925 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:171
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:173
  msgid "Faible reduction"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:368
***************
*** 8489,8500 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
- #, fuzzy
  msgid "Generation (copies):"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
--- 8498,8508 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:292
  msgid "Generation (copies):"
! msgstr "??????????????? (generation)???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:321
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:323
  msgid "Generations diverses"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:99
***************
*** 9227,9231 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
--- 9235,9239 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:344
  msgid "Il ne s'agit pas d'un support de securite"
! msgstr "?????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:1087
***************
*** 11783,11787 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
--- 11791,11795 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:50
  msgid "Micro opaque"
! msgstr "?????????????????? (micro opaque)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_106.tmpl:44
***************
*** 11793,11817 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
--- 11801,11825 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:40
  msgid "Microfiche"
! msgstr "???????????? (microfiche)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:43
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:45
  msgid "Microfiche en cassette"
! msgstr "?????????????????? (microfiche cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:33
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:35
  msgid "Microfilm en bobine"
! msgstr "?????????????????? (microform reel)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:23
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:25
  msgid "Microfilm en cartouche"
! msgstr "?????????????????? (microform cartridge)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:28
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:30
  msgid "Microfilm en cassette"
! msgstr "?????????????????? (microform cassette)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:250
***************
*** 12076,12082 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
- #, fuzzy
  msgid "Monochrome"
! msgstr "?????? (??????)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
--- 12084,12089 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:224
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:226
  msgid "Monochrome"
! msgstr "?????? (monochrome)"
  
  # NOTE Cf http://dimes.lins.fju.edu.tw/pub/bulletin-lac-60/dc-cmark.htm
***************
*** 12368,12372 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
--- 12375,12379 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:81
  msgid "Negatif"
! msgstr "?????? (negative)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:40
***************
*** 13198,13202 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
--- 13205,13209 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:178
  msgid "Normale (16x - 30x)"
! msgstr "???????????????16???30??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:209
***************
*** 13280,13284 ****
  "directory."
  msgstr "??????????????????????????? misc ???????????? fines2.pl ?????????"
!  
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
--- 13287,13291 ----
  "directory."
  msgstr "??????????????????????????? misc ???????????? fines2.pl ?????????"
! 
  #: ../../koha-tmpl/intranet-tmpl/default/en/export/marc.tmpl:14
  msgid "Note : the items are NOT exported by this tool"
***************
*** 14868,14872 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
--- 14875,14879 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:91
  msgid "Plusieurs polarites"
! msgstr "??????????????? (mixed polarity)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128a.tmpl:318
***************
*** 14923,14929 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
- #, fuzzy
  msgid "Polarite:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
--- 14930,14935 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:65
  msgid "Polarite:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:42
***************
*** 15027,15033 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
- #, fuzzy
  msgid "Positif"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
--- 15033,15038 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:74
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:76
  msgid "Positif"
! msgstr "?????? (positive)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:195
***************
*** 15121,15125 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
--- 15126,15130 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:303
  msgid "Premiere generation (master)"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:425
***************
*** 15133,15137 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "?????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
--- 15138,15142 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:9
  msgid "Presentation materielle:"
! msgstr "?????????????????????????????????????????? / ?????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:970
***************
*** 15424,15433 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
- #, fuzzy
  msgid "Rapport de reduction:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
--- 15429,15437 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:208
  msgid "Rapport de reduction specifique"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:162
  msgid "Rapport de reduction:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_105.tmpl:495
***************
*** 15684,15696 ****
  msgstr ""
  
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
- #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
- msgid "Renseignement techniques sur la musique"
- msgstr "???????????????????????????"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:505
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:507
--- 15688,15691 ----
***************
*** 15739,15747 ****
--- 15734,15748 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:490
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:492
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:576
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:578
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:662
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:664
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:748
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:750
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:834
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:836
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:920
+ #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126a.tmpl:922
  msgid "Renseignements techniques sur la musique"
  msgstr "???????????????????????????"
***************
*** 16484,16488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
--- 16485,16489 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:257
  msgid "Sel d'argent"
! msgstr "?????? (silver halide)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:9
***************
*** 17461,17465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
--- 17462,17466 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:328
  msgid "Support de film:"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1124
***************
*** 17470,17474 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
--- 17471,17475 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:339
  msgid "Support de securite"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:1141
***************
*** 18394,18400 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
- #, fuzzy
  msgid "Tirage"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
--- 18395,18400 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:306
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:308
  msgid "Tirage"
! msgstr "??????????????? (printing master)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:34
***************
*** 18743,18747 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
--- 18743,18747 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:188
  msgid "Tres elevee (61x - 90x)"
! msgstr "???????????????61???90 ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:23
***************
*** 19127,19131 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr ""
  
  #  NOTE ???????????? by Arthur
--- 19127,19131 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:193
  msgid "Ultra elevee (91x -)"
! msgstr "???????????????91?????????"
  
  #  NOTE ???????????? by Arthur
***************
*** 19426,19430 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
--- 19426,19430 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_130.tmpl:267
  msgid "Vesiculaire"
! msgstr "?????? (vesicular)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:132
***************
*** 20402,20406 ****
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, , c-format
  msgid "for branch = %s"
  msgstr ""
--- 20402,20406 ----
  #. %1$s: TMPL_VAR name=branch
  #: ../../koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl:5
! #, c-format
  msgid "for branch = %s"
  msgstr ""
***************
*** 20645,20664 ****
  msgstr "??????*"
  
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem.tmpl:111
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- #, fuzzy
- msgid "mandatory fields empty (see bold subfields)"
- msgstr "???????????????????????????????????????????????????"
- 
- #. For the first occurrence,
- #. SCRIPT
- #: ../../koha-tmpl/intranet-tmpl/default/en/acqui.simple/addbiblio.tmpl:493
- #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:171
- msgid "mandatory tags empty"
- msgstr "????????????????????????"
- 
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/search.marc/search.tmpl:20
  msgid "means : find biblio that have a"
--- 20645,20648 ----
***************
*** 21950,21953 ****
--- 21934,21940 ----
  #~ msgstr "??????*"
  
+ #~ msgid "Renseignement techniques sur la musique"
+ #~ msgstr "???????????????????????????"
+ 
  #~ msgid "Rep"
  #~ msgstr "?????????"




From acli at users.sourceforge.net  Mon Jan 24 09:12:49 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:12:49 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1,1.1.2.1
Message-ID: <E1CszL7-0002SI-Td@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Disambiguation for CMARC


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_116.tmpl	7 Jun 2004 09:50:40 -0000	1.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
***************
*** 219,223 ****
  
  	<tr>
! 		<td>Couleur</td>
  		<td>
  			<select name="f4" size="1">
--- 219,223 ----
  
  	<tr>
! 		<td>Couleur:</td>
  		<td>
  			<select name="f4" size="1">




From acli at users.sourceforge.net  Mon Jan 24 09:14:57 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 00:14:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_116.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CszNB-0002Zr-W5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9883

Modified Files:
      Tag: rel_2_2
	unimarc_field_116.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_116.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_116.tmpl	24 Jan 2005 08:12:31 -0000	1.1.2.1
--- unimarc_field_116.tmpl	24 Jan 2005 08:14:55 -0000	1.1.2.2
***************
*** 342,346 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 342,346 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 541,545 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 541,545 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->
***************
*** 741,745 ****
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie nore</option>
  
  			<!-- /TMPL_IF -->
--- 741,745 ----
  				<option value="ah" SELECTED>Craie noire</option>
  			<!-- TMPL_ELSE -->
! 				<option value="ah">Craie noire</option>
  
  			<!-- /TMPL_IF -->




From acli at users.sourceforge.net  Mon Jan 24 10:00:52 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:00:52 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.6,1.4.2.7
Message-ID: <E1Ct05c-0005HU-53@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20194

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly copied from CMARC


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -C2 -r1.4.2.6 -r1.4.2.7
*** default_intranet_zh_TW.po	24 Jan 2005 07:57:34 -0000	1.4.2.6
--- default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
***************
*** 2506,2509 ****
--- 2506,2510 ----
  msgstr "??????"
  
+ #  FIXME ????????????????????????????????????????????????????????????????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:438
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:440
***************
*** 2513,2517 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:839
  msgid "Acrylique"
[...1243 lines suppressed...]
  msgid "Tirage photographique"
! msgstr "?????? (photoprint)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:231
***************
*** 18584,18590 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
- #, fuzzy
  msgid "Toile"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016
--- 18542,18547 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:89
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:91
  msgid "Toile"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:1016




From acli at users.sourceforge.net  Mon Jan 24 10:31:26 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 01:31:26 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.7,1.4.2.8
Message-ID: <E1Ct0ZC-0007GS-S5@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27788

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -C2 -r1.4.2.7 -r1.4.2.8
*** default_intranet_zh_TW.po	24 Jan 2005 09:00:40 -0000	1.4.2.7
--- default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
***************
*** 7664,7670 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
- #, fuzzy
  msgid "Error 401"
! msgstr "?????????%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/400.tmpl:5
--- 7664,7669 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/errors/401.tmpl:5
[...1547 lines suppressed...]
  msgid "Nocturnes"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115a.tmpl:58
***************
*** 12792,12798 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
- #, fuzzy
  msgid "Non-applicable"
! msgstr "(?????????)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604
--- 12690,12695 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:46
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:48
  msgid "Non-applicable"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_115b.tmpl:604




From slef at users.sourceforge.net  Mon Jan 24 14:25:06 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:25:06 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88,1.88.2.1
Message-ID: <E1Ct4DK-0006S1-4Y@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24709

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
porting changes from 2.0.x

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88
retrieving revision 1.88.2.1
diff -C2 -r1.88 -r1.88.2.1
*** Install.pm	5 Jan 2005 14:31:17 -0000	1.88
--- Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
***************
*** 3,7 ****
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003 MJ Ray
  #
  # This file is part of Koha.
--- 3,7 ----
  
  # Copyright 2000-2002 Katipo Communications
! # Contains parts Copyright 2003-4 MJ Ray
  #
  # This file is part of Koha.
***************
*** 27,33 ****
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
  require Exporter;
  
--- 27,34 ----
  #MJR: everyone will have these modules, right?
  # They look like part of perl core to me
! #use Term::Cap;
  use Term::ANSIColor qw(:constants);
  use Text::Wrap;
+ use File::Temp qw/ :mktemp /;
  require Exporter;
  
***************
*** 61,64 ****
--- 62,66 ----
  		&getmessage
  		&showmessage
+ 		&completeupgrade
  		&releasecandidatewarning
  		&getinstallationdirectories
***************
*** 86,90 ****
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
--- 88,92 ----
  use vars qw( $etcdir );				# set in installer.pl, usu. /etc
  use vars qw( $intranetdir $opacdir $kohalogdir );
! use vars qw( $realhttpdconf $httpduser $httpdgroup );
  use vars qw( $servername $svr_admin $opacport $intranetport );
  use vars qw( $mysqldir );
***************
*** 107,114 ****
  =cut
  
! my $termios = POSIX::Termios->new();
! $termios->getattr();
! my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n";
  
  sub heading ($) {
--- 109,116 ----
  =cut
  
! #my $termios = POSIX::Termios->new();
! #$termios->getattr();
! #my $terminal = Term::Cap->Tgetent({OSPEED=>$termios->getospeed()});
! my $clear_string = "\n\n"; #MJR: was $terminal->Tputs('cl');
  
  sub heading ($) {
***************
*** 119,123 ****
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = `mktemp my.cnf.koha.XXXXXX`;
  chomp($mytmpcnf);
  
--- 121,125 ----
  
  my $mycnf = $ENV{HOME}."/.my.cnf";
! my $mytmpcnf = mktemp("my.cnf.koha.XXXXXX");
  chomp($mytmpcnf);
  
***************
*** 127,138 ****
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: 
! * where most koha files should be stored (you can set the prefix environment variable for this);
! * the username and password of a mysql superuser; 
! * Details of your library setup. 
! * Details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for multiple Koha versions on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
--- 129,139 ----
     heading('Welcome to the Koha Installer') . qq|
  This program will ask some questions and try to install koha for you.
! You need to know: where most koha files should be stored (you can set
! the prefix environment variable for this); the username and password of
! a mysql superuser; and details of your library setup.  You may also need
! to know details of your Apache setup.
  
  If you want to install the Koha configuration files somewhere other than
! /etc (for installing not as root, or to have many Kohas on one system, for example), you should
  set the etcdir environment variable.  Please look at your manuals for
  details of how to set that.
***************
*** 149,153 ****
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 150,154 ----
  $messages->{'WelcomeToUpgrader'}->{en} =
     heading('Welcome to the Koha Upgrader') . qq|
! You are attempting to upgrade from Koha %s to Koha %s.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 262,269 ****
--- 263,274 ----
  $messages->{'Completed'}->{en} = heading('INSTALLATION COMPLETE') . qq|
  Congratulations ... your Koha installation is complete!
+ 
  You will be able to connect to your Librarian interface at:
+ 
     http://%s\:%s/
+ 
     use the koha admin mysql login and password to connect to this interface.
  and the OPAC interface at:
+ 
     http://%s\:%s/
     
***************
*** 283,286 ****
--- 288,305 ----
  
  #'
+ 
+ =item completeupgrade
+ 
+    completeupgrade
+ 
+ Display a message describing what may need changing in httpd.conf
+ and any other instructions
+ 
+ =cut
+ 
+ sub completeupgrade {
+ 	showmessage(getmessage('UpgradeCompleted',[$intranetdir,$intranetdir,$intranetdir,$opacdir,$opacdir,$intranetdir]),'PressEnter');
+ }
+ 
  sub releasecandidatewarning {
      my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
***************
*** 290,294 ****
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements','');
  	print $message."\n";
  	exit;
--- 309,313 ----
  	print getmessage('continuing');
      } else {
! 	my $message=getmessage('WatchForReleaseAnnouncements');
  	print $message."\n";
  	exit;
***************
*** 375,378 ****
--- 394,398 ----
  Sets the sysconfdir, normally /etc.
  This should be an absolute path; a trailing / is not required.
+ Must be writeable, else we die.
  
  =cut
***************
*** 380,383 ****
--- 400,404 ----
  sub setetcdir ($) {
      ($etcdir) = @_;
+     if (! ((-d $etcdir) && (-w $etcdir))) { die("Cannot write to $etcdir! Please set the etcdir environment variable to a writeable directory.\nFailed"); }
  }
  
***************
*** 933,937 ****
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; } #"
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
--- 954,958 ----
  sub getinstallationdirectories {
  	my ($auto_install) = @_;
! 	if (!$ENV{prefix}) { $ENV{prefix} = "/usr/local"; }
      $opacdir = $ENV{prefix}.'/koha/opac';
      $intranetdir = $ENV{prefix}.'/koha/intranet';
***************
*** 1026,1030 ****
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") { #"
  	    $mysqldir=$mysql;
         }
--- 1047,1051 ----
  			  /usr
  			  )) {
!        if ( -d $mysql  && -f "$mysql/bin/mysqladmin") {
  	    $mysqldir=$mysql;
         }
***************
*** 1303,1307 ****
--- 1324,1330 ----
  NOTE: You will need to add lines to your main httpd.conf to
  include %s/koha-httpd.conf
+ (using the Include directive)
  and to make sure it is listening on the right ports
+ and host names
  (using the Listen directive).
  
***************
*** 1463,1466 ****
--- 1486,1497 ----
  	print SITE <<EOP
  
+ # Koha 2.2 Apache Virtual Host Config File
+ #
+ # Please include this file in your apache configuration.
+ # The best way to do that depends on your site setup.
+ # Some like an Include adding to /etc/apache/httpd.conf
+ # and some prefer a symlink to this file from some dir.
+ # Please refer to your system manuals.
+ 
  # Ports to listen to for Koha
  # uncomment these if they aren't already in main httpd.conf
***************
*** 1469,1472 ****
--- 1500,1505 ----
  
  # NameVirtualHost is used by one of the optional configurations detailed below
+ # Please make sure this line is correct before uncommenting.
+ # See http://httpd.apache.org/docs/vhosts/ for some guides.
  
  #NameVirtualHost 11.22.33.44
***************
*** 1478,1481 ****
--- 1511,1515 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ $opacdir/cgi-bin/
+    Redirect permanent index.html http://$servername\:$opacport/cgi-bin/koha/opac-main.pl
     ErrorLog $logfiledir/opac-error_log
     TransferLog $logfiledir/opac-access_log
***************
*** 1491,1494 ****
--- 1525,1529 ----
     ServerName $servername
     ScriptAlias /cgi-bin/koha/ "$intranetdir/cgi-bin/"
+    Redirect permanent index.html http://$servername\:$intranetport/cgi-bin/koha/mainpage.pl
     ErrorLog $logfiledir/koha-error_log
     TransferLog $logfiledir/koha-access_log




From slef at users.sourceforge.net  Mon Jan 24 14:34:23 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 05:34:23 -0800
Subject: [Koha-cvs] CVS: koha/misc Install.pm,1.88.2.1,1.88.2.2
Message-ID: <E1Ct4MJ-00071J-0g@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26955

Modified Files:
      Tag: rel_2_2
	Install.pm 
Log Message:
database must be last parameter to bin/mysql in some version

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.1
retrieving revision 1.88.2.2
diff -C2 -r1.88.2.1 -r1.88.2.2
*** Install.pm	24 Jan 2005 13:24:51 -0000	1.88.2.1
--- Install.pm	24 Jan 2005 13:34:19 -0000	1.88.2.2
***************
*** 1806,1811 ****
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");#"
! 	system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
--- 1806,1811 ----
  	# Set up permissions
  	startsysout();
! 	print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
! 	system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\" mysql");
  	system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
  	# Change to admin user login
***************
*** 1951,1957 ****
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
  
  		my $printername='lp';
--- 1951,1957 ----
  
  		startsysout();
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
  
  		my $printername='lp';
***************
*** 1972,1976 ****
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
  	}
  	my $language;
--- 1972,1976 ----
  		}
  		startsysout();	
! 		system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
  	}
  	my $language;
***************
*** 1982,1986 ****
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {
--- 1982,1986 ----
  	}
  	startsysout();	
! 	system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
  	my @dirs;
  	if (-d "scripts/misc/sql-datas") {




From slef at users.sourceforge.net  Mon Jan 24 20:37:58 2005
From: slef at users.sourceforge.net (MJ Ray)
Date: Mon, 24 Jan 2005 11:37:58 -0800
Subject: [Koha-cvs] CVS: koha/misc/info INSTALL,NONE,1.1.2.1 ChangeLog,1.1,1.1.4.1 README,1.2,1.2.4.1
Message-ID: <E1CtA2A-000630-60@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/info
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23168

Modified Files:
      Tag: rel_2_2
	ChangeLog README 
Added Files:
      Tag: rel_2_2
	INSTALL 
Log Message:
Instructions and friends from 2.0

--- NEW FILE ---
Koha release 2.0.1 (stable series, first point release)
28 August 2004 MJR

Koha is distributed under the GNU GPL. Please read the file LICENSE for
more details.

To install the system please run: perl installer.pl

This will:
 1. Check for missing perl modules;
 2. Ask some questions and run some programs to collect system information;
 3. Write an apache httpd.conf file;
 4. Copy koha to the installation directory;
 5. Create a mysql database and load in basic data;
 6. Offer to try restarting apache;
 7. Invite you to fill in a survey from koha's developers.

perl 5.6.1 or higher is required.

The perl modules required are:
  DBI, Date::Manip, DBD::mysql, HTML::Template, Digest::MD5,
  MARC::Record, Mail::Sendmail, Event
Optionally, we can also use:
  Net::Z3950
You can install packages for these, or CPAN builds. The installer will
suggest CPAN builds, but it's your choice.

After installation, you need to make sure the generated koha-httpd.conf
file is "Include"d into your apache configuration and restart apache.
You may also need to configure daemons, depending on your installation.

A common need is to add the fines2.pl script to crontab. You will need
to put perl -I/path/to/koha/intranet/modules /path/to/fines2.pl, so
that it can find the koha modules.

If you wish to install without being root, please set the "etcdir" and
"prefix" environment variables before running the installer. etcdir
will be the configuration directory and prefix will be the installation
root directory.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** ChangeLog	22 Nov 2002 09:09:35 -0000	1.1
--- ChangeLog	24 Jan 2005 19:37:39 -0000	1.1.4.1
***************
*** 1,2 ****
--- 1,181 ----
+ 2004-11-17 13:03:42 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.2
+ 
+     Summary:
+       2.0.2 release update
+ 
+     README: updated version number, noted mod_perl unsafe
+     
+     modified files:
+      README
+ 
+ 
+ 2004-11-05 12:02:53 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1-patch-9
+ 
+     Summary:
+       Bugfixes
+ 
+     modules/C4/Maintenance.pm
+       Removed superfluous quote() calls after Chris spotted it in 2.1
+       Might fix some catmaint.pl problems.
+     
+     koha.version
+       2.0.2
+     
+     modified files:
+      koha.version modules/C4/Maintainance.pm
+ 
+ 
+ 2004-10-29 19:52:14 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.1
+ 
+     Summary:
+       small bugfixes
+     Revision:
+ 
+     C4::Biblio bugfix from Paul Poulain:
+       drop empty fields, but NOT fields containing 0
+     
+     Remove spanish language option:
+       will be readded when translators answer email
+     
+     README:
+       add comment about fines2.pl
+     
+     Fix for bug 789:
+       shedges: patch -F 3 modules/C4/Search.pm BorrSearchPatch.txt
+ 
+     modified files:
+      INSTALL Install.pm modules/C4/Biblio.pm modules/C4/Search.pm
+ 
+ 
+ 2004-08-27 23:37:02 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-7
+ 
+     Summary:
+       Add release docs
+ 
+     2.0.1 release documentation
+     
+ 
+     new files:
+      INSTALL
+ 
+     modified files:
+      README
+ 
+ 
+ 2004-08-24 18:33:51 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-6
+ 
+     Summary:
+       Fix bug 816
+ 
+     Fixes bugs.koha.org 816 - use httpd config instead of meta redirect
+ 
+     modified files:
+      Install.pm
+ 
+ 
+ 2004-07-28 23:19:07 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-5
+ 
+     Summary:
+       Add kohaRHinstall
+ 
+     Slightly modified version of this, with Stephen's blessing. Probably
+     needs updating before release, if possible.
+     
+ 
+     new files:
+      docs/KohaRHinstall.html
+ 
+ 
+ 2004-07-28 23:18:06 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-4
+ 
+     Summary:
+       Bugfixes (esp. statistics/reports) and documentation
+ 
+     Complete bug 791 limit fix in C4::Authorities and C4::Maintainance, thanks to Kris Boutilier
+     
+     Check etcdir can be written to, in setetcdir.
+     
+     Added docs/installing_koha_on_debian.html from Joshua (GPL)
+     
+     Added optional parameter to C4::Stats::unfilledreserves to only select today's reserves
+     
+     Used unused parameter $time in intranet-cgi/reservereport.pl to only select today's reserves
+     
+     Updated reports/reports-home.tmpl
+     
+     Added reports/activity.tmpl
+     
+     Added missing function C4::Stats:statsreport
+     
+     Added intranet-cgi/reports/activity.pl
+ 
+     new files:
+      docs/installing_koha_on_debian.html docs/sources.txt
+      intranet-cgi/reports/activity.pl
+      intranet-html/intranet-tmpl/default/en/reports/activity.tmpl
+ 
+     modified files:
+      Install.pm intranet-cgi/reservereport.pl
+      intranet-html/intranet-tmpl/default/en/reports/reports-home.tmpl
+      modules/C4/Authorities.pm modules/C4/Circulation/Fines.pm
+      modules/C4/Maintainance.pm modules/C4/Stats.pm
+      opac-cgi/opac-new.pl
+ 
+ 
+ 2004-06-30 15:36:28 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-3
+ 
+     Summary:
+       Brown paper bag upgrade/Install fixes
+ 
+     Removed $etcdir from koha.upgrade (no longer needed)
+     
+     Added typo-removed $ to Install.pm
+     
+     modified files:
+      Install.pm koha.upgrade
+ 
+ 
+ 2004-06-30 15:13:48 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-2
+ 
+     Summary:
+       Bugfixes
+ 
+     Fix perldoc C4::Search
+     
+     Fix search parameter display bug 196
+     
+     Half-fix thesaurus word search bug 791 - thanks to M. Parienti
+     
+     Fix member.pl search bug 789
+     
+     removed files:
+      scripts/misc/my.cnf.koha.jsqrGh
+ 
+     modified files:
+      intranet-cgi/admin/thesaurus.pl modules/C4/Search.pm
+      opac-html/opac-tmpl/css/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/de/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/en/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/fr/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/pl/opac-searchresults.tmpl
+      opac-html/opac-tmpl/default/zh-TW/opac-searchresults.tmpl
+      opac-html/opac-tmpl/vanilla/en/opac-searchresults.tmpl
+ 
+ 
+ 2004-06-30 12:15:25 GMT	MJ Ray <mjr at dsl.pipex.com>	2.0.0-patch-1
+ 
+     Summary:
+       Installation bugfixes
+ 
+     Fix mysql command syntax in Install.pm (database must be after -e in some v3)
+     
+     Removed FIXMEs from upgradecomplete by moving message inside Install.pm
+     
+     Fixed koha.upgrade mysql password handling
+     
+     Removed duplicate restoremycnf() calls from Install.pm - this is installer.pl's concern
+ 
+ 
  2002-10-30  Andrew Arensburger  <arensb at baa.ooblick.com>
  

Index: README
===================================================================
RCS file: /cvsroot/koha/koha/misc/info/README,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -C2 -r1.2 -r1.2.4.1
*** README	20 Jan 2003 03:40:03 -0000	1.2
--- README	24 Jan 2005 19:37:50 -0000	1.2.4.1
***************
*** 1,7 ****
! 19/7/00 chris at katipo.co.nz
  
! Koha is distributed under the GPL license, please read the file LICENSE for
  more details.
  
! To install the system please run installer.pl
  
--- 1,16 ----
! Koha release 2.0.2 (2.0 stable series, second point release)
! 17 November 2004 MJR
  
! Koha is distributed under the GNU GPL. Please read the file LICENSE for
  more details.
  
! To install the system, please see the INSTALL file.
! 
! To upgrade an existing system, please run: perl koha.upgrade
! 
! Please report any bugs to the koha mailing lists or bug tracker and we
! will try to fix them in a future release if possible. The main koha web
! site is http://www.koha.org/
! 
! Running under mod_perl is not advised for this version.
  




From oleonard at users.sourceforge.net  Mon Jan 24 21:42:20 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 12:42:20 -0800
Subject: [Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.1,1.6.2.2
Message-ID: <E1CtB2S-0001oL-25@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6814/C4

Modified Files:
      Tag: rel_2_2
	Bull.pm 
Log Message:
Formatting subscription start date in get_subscription_list_from_biblionumber according to system preference

Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** Bull.pm	11 Jan 2005 15:07:58 -0000	1.6.2.1
--- Bull.pm	24 Jan 2005 20:41:47 -0000	1.6.2.2
***************
*** 177,180 ****
--- 177,181 ----
  	my @res;
  	while (my $subs = $sth->fetchrow_hashref) {
+ 		$subs->{'startdate'} = format_date($subs->{'startdate'});
  		push @res,$subs;
  	}




From oleonard at users.sourceforge.net  Mon Jan 24 22:59:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 13:59:57 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-serial-issues.pl,1.1.2.1,1.1.2.2
Message-ID: <E1CtCFZ-0005y9-Ao@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22780/opac

Modified Files:
      Tag: rel_2_2
	opac-serial-issues.pl 
Log Message:
Adding biblionumber to output variables so that link back to biblio works.

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-serial-issues.pl	11 Jan 2005 15:24:14 -0000	1.1.2.1
--- opac-serial-issues.pl	24 Jan 2005 21:59:12 -0000	1.1.2.2
***************
*** 33,36 ****
--- 33,37 ----
  
  $template->param(
+ 	biblionumber => $query->param('biblionumber'),
  	subscription_LOOP => $subscriptions
  # 	startdate => format_date($subscription->{startdate}),




From oleonard at users.sourceforge.net  Mon Jan 24 23:08:00 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:08:00 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.1,1.15.2.2
Message-ID: <E1CtCNM-0006Nq-Um@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24398/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -C2 -r1.15.2.1 -r1.15.2.2
*** opac-detail.tmpl	11 Jan 2005 15:24:13 -0000	1.15.2.1
--- opac-detail.tmpl	24 Jan 2005 22:07:11 -0000	1.15.2.2
***************
*** 47,51 ****
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 47,51 ----
  			<td>
  				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:12:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:12:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15,1.16
Message-ID: <E1CtCRW-0006bq-4N@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25326/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Moving position of <!-- /TMPL_IF --> relative to <br> to prevent unwanted whitespace for empty elements.

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.tmpl	3 Jan 2005 11:09:33 -0000	1.15
--- opac-detail.tmpl	24 Jan 2005 22:11:54 -0000	1.16
***************
*** 46,51 ****
  		<tr>
  			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="subtitle" -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --><br />
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
--- 46,51 ----
  		<tr>
  			<td>
! <!-- TMPL_IF name="subtitle" --><b>Subtitle:</b> <!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
***************
*** 53,67 ****
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="isbn" --><br />
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="seriestitle" --><br />
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b><!-- /TMPL_IF --> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br />
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="copyrightdate" --><br />
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="notes" --><br />
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="unititle" --><br />
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- /TMPL_IF --><!-- TMPL_VAR name="dewey" --><br />
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br />
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
--- 53,67 ----
  				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
  					<!-- TMPL_LOOP name="subjects" -->
  						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
  				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
  				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->




From oleonard at users.sourceforge.net  Mon Jan 24 23:52:34 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:52:34 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1 opac-serial-issues.tmpl,NONE,1.1 opac-ISBDdetail.tmpl,1.1,1.2 opac-MARCdetail.tmpl,1.1,1.2 opac-detail.tmpl,1.1,1.2
Message-ID: <E1CtD4U-0000mf-6F@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2852/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-ISBDdetail.tmpl opac-MARCdetail.tmpl opac-detail.tmpl 
Added Files:
	opac-addbookbybiblionumber.tmpl opac-serial-issues.tmpl 
Log Message:
Synching with default tempalte, other cosmetic changes

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Subscription Details
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->

<div id="main">

<h1>Subscription Details</h1>
<div class="table details">
<!-- TMPL_LOOP name="subscription_LOOP" -->
	<table>
	<caption><em><!-- TMPL_VAR name="bibliotitle" --></em></caption>
	<tr><th>Details:</th><td><p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every <b> <!--TMPL_IF name="periodicity1" --> day <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity2" --> week <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity3" --> 2 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity4" --> 3 weeks <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity5" --> month <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity6" --> 2 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity7" --> 3 months <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity8" --> quarter <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity9" --> 2 quarters <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity10" --> year <!-- /TMPL_IF --> <!--TMPL_IF name="periodicity11" --> 2 years <!-- /TMPL_IF --> </b> on <b> <!--TMPL_IF name="arrival1" --> 	Monday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival2" --> Tuesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival3" --> Wednesday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival4" --> Thursday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival5" --> Friday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival6" --> Saturday <!-- /TMPL_IF --> <!--TMPL_IF name="arrival7" --> Sunday <!-- /TMPL_IF --> </b> for <b> 	<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF --> 	<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF --> 	<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF --> 	</b> since <b><!-- TMPL_VAR name="startdate" --></b> </p></td></tr>
<!-- TMPL_IF name="notes" --><tr><th>Notes: </th><td><!-- TMPL_VAR name="notes" --></td></tr><!-- /TMPL_IF -->
<!-- TMPL_IF name="opacnotes" --><tr><th>Issues summary</th><td><!-- TMPL_VAR name="opacnote" --></td></tr><!-- /TMPL_IF -->
	</table><!-- /TMPL_LOOP -->
</div>
<form action="/cgi-bin/koha/opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><p><input type="submit" class="submit" value="Back to Normal View" /></p></form>

</div>
</body>
</html>



Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	24 Jan 2005 22:51:51 -0000	1.2
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-MARCdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-MARCdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-MARCdetail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 6,22 ****
  <div id="main">
  <h2>MARC View</h2>
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="brief" value="Normal View" /></form>
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
! <form class="inline"><input type="submit" class="cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
--- 6,22 ----
  <div id="main">
  <h2>MARC View</h2>
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  <!-- <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Normal View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" /></form>
  
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
  <div class="table">
  		<table><!-- TMPL_LOOP name="0XX" -->
***************
*** 120,124 ****
  		<!-- /TMPL_LOOP -->
  	</table>
! 	
  		<table>
  		<caption>Copies</caption>
--- 120,124 ----
  		<!-- /TMPL_LOOP -->
  	</table>
! <!-- TMPL_IF NAME="item_header_loop" -->
  		<table>
  		<caption>Copies</caption>
***************
*** 135,139 ****
--- 135,143 ----
  					</tr>
  				<!-- /TMPL_LOOP -->
+ 		</table><!-- TMPL_ELSE -->
+ 		<table>
+ 			<tr><td>No copies available.</td></tr>
  		</table>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
***************
*** 35,43 ****
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
--- 35,41 ----
  <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
  <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
  </table>
***************
*** 72,86 ****
  	</table>
  
! <TMPL_UNLESS NAME="norequests">
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! </TMPL_UNLESS>
! <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
  
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
--- 70,87 ----
  	</table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
      <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
      <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
      </form>
! <!-- /TMPL_UNLESS -->
  
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
  
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
  
  <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
***************
*** 112,115 ****
--- 113,119 ----
  <table><tr><td>No copies available.</td></tr></table>
  <!-- /TMPL_IF -->
+ 	<!-- TMPL_IF name="subscriptionsnumber" -->
+ 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
+ 	<!-- /TMPL_IF -->
  </div>
  </div>




From oleonard at users.sourceforge.net  Mon Jan 24 23:54:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:54:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.2
Message-ID: <E1CtD63-0000sU-HT@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3261/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding styles for more input buttons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	24 Jan 2005 22:54:02 -0000	1.2
***************
*** 518,521 ****
--- 518,533 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Mon Jan 24 23:55:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Mon, 24 Jan 2005 14:55:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/images addtoshelf.gif,NONE,1.1 isbd.gif,NONE,1.1 placereserve.gif,NONE,1.1 addtobasket.gif,1.1,1.2 basket.gif,1.1,1.2 clearbasket.gif,1.1,1.2
Message-ID: <E1CtD7R-0000wi-Ij@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3485/koha-tmpl/opac-tmpl/npl/en/images

Modified Files:
	addtobasket.gif basket.gif clearbasket.gif 
Added Files:
	addtoshelf.gif isbd.gif placereserve.gif 
Log Message:
Adding and updating input button images

--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
--- NEW FILE ---
GIF89a
Index: addtobasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/addtobasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsVA8MFf and /tmp/cvsuQkGMD differ

Index: basket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/basket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsYU6vAC and /tmp/cvsuauCKd differ

Index: clearbasket.gif
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/images/clearbasket.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvs4fJPY7 and /tmp/cvsOQuiCM differ




From acli at users.sourceforge.net  Tue Jan 25 04:47:04 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 19:47:04 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.8,1.4.2.9
Message-ID: <E1CtHfU-0006eQ-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25498

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.8
retrieving revision 1.4.2.9
diff -C2 -r1.4.2.8 -r1.4.2.9
*** default_intranet_zh_TW.po	24 Jan 2005 09:31:17 -0000	1.4.2.8
--- default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
***************
*** 25,29 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
  "PO-Revision-Date: 2004-02-23 17:20-0500\n"
--- 25,29 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Koha INTRANET 2.2.1cvs\n"
  "POT-Creation-Date: 2005-01-24 02:10-0500\n"
[...1111 lines suppressed...]
- #, fuzzy
  msgid "Overdue charges"
! msgstr "??????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
--- 13865,13870 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:14
  msgid "Overdue charges"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/issuingrules.tmpl:6
***************
*** 13956,13960 ****
  #  NOTE ????????????Simon Blake???#koha??????
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl:37
- #, fuzzy
  msgid "P&amp;P"
  msgstr "??????"
--- 13895,13898 ----




From acli at users.sourceforge.net  Tue Jan 25 05:54:36 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:54:36 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_100.tmpl,1.3,1.3.2.1
Message-ID: <E1CtIiq-0001lo-E4@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6781

Modified Files:
      Tag: rel_2_2
	unimarc_field_100.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_100.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** unimarc_field_100.tmpl	7 Jun 2004 09:46:36 -0000	1.3
--- unimarc_field_100.tmpl	25 Jan 2005 04:54:33 -0000	1.3.2.1
***************
*** 304,308 ****
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municiapal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->
--- 304,308 ----
  				SELECTED>local(municipal, etc.)</option>
  			<!-- TMPL_ELSE -->
! 				<option value="d">local(municipal, etc.)</option>
  			<!-- /TMPL_IF -->
  			<!-- TMPL_IF name="f8e" -->




From acli at users.sourceforge.net  Tue Jan 25 05:57:34 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 20:57:34 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.9,1.4.2.10
Message-ID: <E1CtIli-0001w4-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7379

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update, mostly unimarc tag 100 related


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.9
retrieving revision 1.4.2.10
diff -C2 -r1.4.2.9 -r1.4.2.10
*** default_intranet_zh_TW.po	25 Jan 2005 03:46:58 -0000	1.4.2.9
--- default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
***************
*** 2971,2977 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
- #, fuzzy
  msgid "Allegorie"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:58
--- 2971,2976 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1382
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_140.tmpl:1384
[...980 lines suppressed...]
  #. INPUT type=submit
--- 20732,20736 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:50
  msgid "reproduction"
! msgstr "?????????????????????????????????????????????"
  
  #. INPUT type=submit
***************
*** 20799,20803 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr ""
  
  #  NOTE???See???????????????????????????See also???????????????????????????????????????
--- 20783,20787 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_100.tmpl:249
  msgid "scolaire"
! msgstr "???????????????5-10 ???"
  
  #  NOTE???See???????????????????????????See also???????????????????????????????????????




From acli at users.sourceforge.net  Tue Jan 25 06:31:59 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Mon, 24 Jan 2005 21:31:59 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.10,1.4.2.11
Message-ID: <E1CtJJ1-0003hO-6f@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14192

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.10
retrieving revision 1.4.2.11
diff -C2 -r1.4.2.10 -r1.4.2.11
*** default_intranet_zh_TW.po	25 Jan 2005 04:57:26 -0000	1.4.2.10
--- default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
***************
*** 551,555 ****
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authorised_value
--- 551,555 ----
  #, c-format
  msgid "%s or thesaurus: %s or plugin: %s"
! msgstr "%s ??????????????????%s ????????????%s"
  
  #. %1$s: TMPL_VAR name=authorised_value
***************
*** 814,818 ****
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=authtypecode
--- 814,818 ----
  #, c-format
  msgid "(defined from suggestion #%s)"
! msgstr "(???????????? %s ?????????????????????)"
  
  #. %1$s: TMPL_VAR name=authtypecode
***************
*** 1430,1433 ****
--- 1430,1435 ----
  "<a5> ISBD </a> <a6> Add to shelf </a> <a7> Print </a>"
  msgstr ""
+ "<a1> ???????????? </a> <a2> ?????????????????? </a> <a3> ?????? </a> <a4> ?????? </a> "
+ "<a5> ISBD </a> <a6> ????????????????????? </a> <a7> ?????? </a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:4
***************
*** 1439,1449 ****
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, fuzzy, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1>????????????</a> <a2>????????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
--- 1441,1451 ----
  #, c-format
  msgid "<a1> Normal </a> <a2> MARC </a> <a3> Add to shelf </a> <a4> Print </a>"
! msgstr "<a1> ?????? </a> <a2> MARC </a> <a3> ????????????????????? </a> <a4> ?????? </a>"
  
  #. %1$s: TMPL_VAR name=count
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:11
! #, c-format
  msgid "<a1> Print </a> <a2>%s biblios</a>"
! msgstr "<a1> ?????? </a> <a2>%s ?????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:29
***************
*** 1460,1466 ****
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, fuzzy, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> %s (%s)"
  
  # FIXME Looks like a SCANNER BUG
--- 1462,1468 ----
  #. %2$s: TMPL_VAR name=shelfbookcount
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:73
! #, c-format
  msgid "<a1>%s</a> (%s item(s))"
! msgstr "<a1>%s</a> (%s ?????????)"
  
  # FIXME Looks like a SCANNER BUG
***************
*** 1482,1486 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, fuzzy, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
--- 1484,1488 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/parameters-top.inc:36
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc:35
! #, c-format
  msgid ""
  "<a1>Acquisitions</a> <a2>Catalogue</a> <a3>Circulation</a> <a4>Members</a> "
***************
*** 1488,1493 ****
  "<a9>Help</a>"
  msgstr ""
! "<a1>??????</a> <a2>??????</a> <a3>??????</a> <a4>??????</a> <a5>??????</a> <a6>??????</"
! "a> <a7>??????</a> <a8>??????</a>"
  
  #  XXX ???????????????????????????
--- 1490,1496 ----
  "<a9>Help</a>"
  msgstr ""
! "<a1>??????</a> <a2>??????</a> <a3>??????</a> <a4>??????</a> "
! "<a5>??????</a> <a6>??????</a> <a7>??????</a> <a8>??????</a> "
! "<a9>??????</a>"
  
  #  XXX ???????????????????????????
***************
*** 1497,1500 ****
--- 1500,1504 ----
  msgstr "<a1>??????????????????</a>??????<a2>????????????????????????</a>"
  
+ #  FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/bull-home.tmpl:32
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/lateissues.tmpl:41
***************
*** 1511,1515 ****
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
--- 1515,1519 ----
  #, c-format
  msgid "<a1>Funds</a> <a2>Auth value</a> <a3>Currencies</a> <a4>Printers</a>"
! msgstr "<a1>??????????????????</a> <a2>?????????</a> <a3>??????</a> <a4>?????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:219
***************
*** 1519,1525 ****
  "<a5>Printers</a>"
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, fuzzy, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
--- 1523,1531 ----
  "<a5>Printers</a>"
  msgstr ""
+ "<a1>??????????????????</a> <a2>?????????</a> <a3>????????????</a> <a4>??????</a> "
+ "<a5>?????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes-top.inc:206
! #, c-format
  msgid ""
  "<a1>Home</a> <a2>Catalogue</a> <a3>Members</a> <a4>Acquisitions</a> "
***************
*** 1527,1537 ****
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>??????</a> <a2>??????</a> <a3>??????</a> <a4>??????</a> <a5>??????</a> <a6>??????</"
! "a> <a7>??????</a> <a8>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, fuzzy, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>??????</a>???<a2>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
--- 1533,1544 ----
  "<a9>About</a> <a10>Help</a>"
  msgstr ""
! "<a1>??????</a> <a2>??????</a> <a3>??????</a> <a4>??????</a> "
! "<a5>??????</a> <a6>??????</a> <a7>??????</a> <a8>??????</a> "
! "<a9>??????</a> <a10>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc:62
! #, c-format
  msgid "<a1>Issues</a> <a2>Returns</a> <a3>Branch transfers</a>"
! msgstr "<a1>??????</a>???<a2>??????</a>???<a3>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/about-top.inc:49
***************
*** 1556,1577 ****
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, fuzzy, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>%s</a> %s (%s)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, fuzzy, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>????????????</a>???<a2>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, fuzzy, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>????????????</a>???<a2>??????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
--- 1563,1584 ----
  #, c-format
  msgid "<a1>MARC</a> <a2>ISBD</a> <a3>Add to shelf</a> <a4>Print</a>"
! msgstr "<a1>MARC</a> <a2>ISBD</a> <a3>?????????????????????</a> <a4>??????</a>"
  
  #. %1$s: TMPL_VAR name=surname
  #. %2$s: TMPL_VAR name=firstname
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:139
! #, c-format
  msgid "<a1>Modify</a> %s%s"
! msgstr "<a1>??????</a> %s%s"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/subject.tmpl:21
! #, c-format
  msgid "<a1>Previous Records</a> <a2>Next Records</a>"
! msgstr "<a1>?????????</a> <a2>?????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/thesaurus.tmpl:137
! #, c-format
  msgid "<a1>Previous</a> <a2> Next</a>"
! msgstr "<a1>?????????</a> <a2>?????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/pay.tmpl:41
***************
*** 1589,1593 ****
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr ""
  
  #  NOTE ???????????? by Arthur
--- 1596,1600 ----
  #, c-format
  msgid "<a1>Search</a> <a2>Add member</a> <a3>Add organisation</a>"
! msgstr "<a1>??????</a> <a2>????????????</a> <a3>????????????</a"
  
  #  NOTE ???????????? by Arthur
***************
*** 1611,1619 ****
  msgstr "<a1>????????????</a>????????????????????????"
  
! #  NOTE ???????????? by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, fuzzy, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>???????????????</a> <h1>%s - ????????????</h1>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
--- 1618,1626 ----
  msgstr "<a1>????????????</a>????????????????????????"
  
! #  FIXME please fix the scanner :-(
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:70
! #, c-format
  msgid "<a1>View Basket</a> <h1 class=\"acquisition\">"
! msgstr "<a1>???????????????</a> <h1 class=\"acquisition\">"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc:51
***************
*** 1622,1641 ****
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, fuzzy, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>????????????</a> <a2>??????????????????</a> <a3>????????????</a> <a4>????????????</a> <a5>"
! "????????????</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, fuzzy, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<a1>??????</a>?????????%s"
  
  #  NOTE ???????????? by Arthur
--- 1629,1647 ----
  msgid ""
  "<a1>search</a> <a2>Add biblio</a> <a3>Serial</a> <a4>Virtual shelves</a>"
! msgstr "<a1>??????</a> <a2>????????????</a> <a3>??????</a> <a4>????????????</a>"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/includes/error-top.inc:56
! #, c-format
  msgid ""
  "<a1>search</a> <a2>Virtual shelves</a> <a3>Add biblio</a> <a4>Cat "
  "maintenance</a>"
  msgstr ""
! "<a1>??????</a> <a2>????????????</a> <a3>????????????</a> <a4>????????????</a>"
  
  #. %1$s: TMPL_VAR name=dateaccessioned
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:61
! #, c-format
  msgid "<b><a1> Accession Date:</a></b> %s"
! msgstr "<b><a1>???????????????</a></b>%s"
  
  #  NOTE ???????????? by Arthur
***************
*** 1693,1699 ****
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>?????????</i>%s <i>????????????</i>%s <a1>????????????</a>"
  
  #. For the first occurrence,
--- 1699,1705 ----
  #. %2$s: TMPL_VAR name=genprname
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:11
! #, c-format
  msgid "<b>Branch:</b> %s &nbsp; <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>?????????</b>%s <b>????????????</b>%s <a1>????????????</a>"
  
  #. For the first occurrence,
***************
*** 1702,1715 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, fuzzy, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<i>?????????</i>%s <i>????????????</i>%s <a1>????????????</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, fuzzy, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "????????????%s"
  
  #. For the first occurrence,
--- 1708,1721 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:13
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:6
! #, c-format
  msgid "<b>Branch:</b> %s, <b>Printer:</b> %s <a1>Change Settings</a>"
! msgstr "<b>?????????</b>%s <i>????????????</b>%s <a1>????????????</a>"
  
  # FIXME BUG in English template
  #. %1$s: TMPL_VAR name=wthdrawn
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:64
! #, c-format
  msgid "<b>Cancelled:</b> %s"
! msgstr "<b>????????????</b>%s"
  
  #. For the first occurrence,
***************
*** 1759,1765 ****
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, fuzzy, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>?????????</b>%s"
  
  # XXX inconsistency?
--- 1765,1771 ----
  #. %1$s: TMPL_VAR name=date_due
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/moredetail.tmpl:53
! #, c-format
  msgid "<b>Date Due:</b> %s"
! msgstr "<b>??????????????????</b>%s"
  
  # XXX inconsistency?
***************
*** 1794,1797 ****
--- 1800,1804 ----
  "improved ldap support)"
  msgstr ""
+ "<b>EMN (Ecole des Mines de Nantes)</b>????????????????????????????????????????????? LDAP ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:19
***************
*** 1803,1811 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (J??rome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr ""
  
  #. %1$s: TMPL_VAR name=biblioitemnumber
--- 1810,1818 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:114
  msgid "<b>Enter Item Barcode:</b> Item Barcode:"
! msgstr "<b>?????????????????????????????????</b>????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:51
  msgid "<b>Esiee School</b> (J??rome Vizcaino, Michel Lerenard, Pierre Cauchois)"
! msgstr "<b>Esiee ??????</b> (J??rome Vizcaino???Michel Lerenard???Pierre Cauchois)"
  
  #. %1$s: TMPL_VAR name=biblioitemnumber




From joshferraro at users.sourceforge.net  Tue Jan 25 17:53:31 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:53:31 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,NONE,1.1
Message-ID: <E1CtTwZ-0000bc-Cu@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2165

Added Files:
	Amazon.pm 
Log Message:
The Amazon module allows libraries to deliver amazon content to the opac


--- NEW FILE ---

package C4::Amazon;
# Copyright 2004-2005 Joshua Ferraro (jmf at kados dot org)
#
# 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
#
# This module dynamically pulls amazon content into Koha.  It does not
# store the data in Koha's database.  You'll need to get a developer's key
# as well as an associate's tag to use it.
# FIXME: need to write up more docs.
#

use strict;
require Exporter;

use vars qw($VERSION @ISA @EXPORT);

$VERSION = 0.01;

@ISA = qw(Exporter);

@EXPORT = qw(
  &get_amazon_details
);

sub get_amazon_details {

my ( $isbn ) = @_;

# insert your dev key here
my $dev_key='';

# insert your associates tag here
my $af_tag='';

my $asin=$isbn;

# old way from command line: shift @ARGV or die "Usage:perl amazon_http.ol <asin>\n";

#my $url = "http://xml.amazon.com/onca/xml3?t=" . $af_tag .
#	"&dev-t=" . $dev_key .
#	"&type=heavy&f=xml&" .
#	"AsinSearch=" . $asin;
my $url = "http://xml.amazon.com/onca/xml3?t=$dev_key&dev-t=$af_tag&type=heavy&f=xml&AsinSearch=" . $asin;

#Here's an example asin for the book "Cryptonomicon"
#0596005423";

use XML::Simple;
use LWP::Simple;
my $content = get($url);
die "could not regrieve $url" unless $content;

my $xmlsimple = XML::Simple->new();
my $response = $xmlsimple->XMLin($content,
  forcearray => [ qw(Details Product AvgCustomerRating CustomerReview) ],
);
return $response;
#foreach my $result (@{$response->{Details}}){
#	my $product_description = $result->{ProductDescription};
#	my $image = $result->{ImageUrlMedium};
#	my $price = $result->{ListPrice};
#	my $reviews = $result->{
#	return $result;
#}
}




From joshferraro at users.sourceforge.net  Tue Jan 25 17:58:20 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 08:58:20 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.14,1.15
Message-ID: <E1CtU1E-0000zL-FC@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3544

Modified Files:
	opac-detail.pl 
Log Message:
Adds amazon support to opac-detail.pl


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** opac-detail.pl	18 Aug 2004 16:44:37 -0000	1.14
--- opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
***************
*** 10,14 ****
  use C4::Biblio;
  use C4::SearchMarc;
! 
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
--- 10,14 ----
  use C4::Biblio;
  use C4::SearchMarc;
! use C4::Amazon;
  my $query=new CGI;
  my ($template, $borrowernumber, $cookie) 
***************
*** 73,76 ****
  				subscriptionid => $subscriptionid,
  );
! 
  output_html_with_http_headers $query, $cookie, $template->output;
--- 73,103 ----
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
! my $isbn=$dat->{'isbn'};
! my $amazon_details = &get_amazon_details($isbn);
! foreach my $result (@{$amazon_details->{Details}}){
!         $template->param(item_description => $result->{ProductDescription});
!         $template->param(image => $result->{ImageUrlMedium});
!         $template->param(list_price => $result->{ListPrice});
!         $template->param(amazon_url => $result->{url});
!                                 }
! 
! my @products;
! my @reviews;
! for my $details( @{ $amazon_details->{ Details } } ) {
!         next unless $details->{ SimilarProducts };
!         for my $product ( @{ $details->{ SimilarProducts }->{ Product } } ) {
!                 push @products, +{ Product => $product };
!         }
!         next unless $details->{ Reviews };
!         for my $product ( @{ $details->{ Reviews }->{ AvgCustomerRating } } ) {
!                 $template->param(rating => $product);
!         }
!         for my $reviews ( @{ $details->{ Reviews }->{ CustomerReview } } ) {
!                 push @reviews, +{ Summary => $reviews->{ Summary }, Comment => $reviews->{ Comment }, };
!         }
! }
! $template->param( SIMILAR_PRODUCTS => \@products );
! $template->param( REVIEWS => \@reviews );
!   ## End of Amazon Stuff
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:13:27 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:13:27 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-detail.pl,1.15,1.16
Message-ID: <E1CtUFr-0002ER-Mg@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8329

Modified Files:
	opac-detail.pl 
Log Message:
makes opac-detail.pl's amazon stuff just a comment


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-detail.pl	25 Jan 2005 16:58:18 -0000	1.15
--- opac-detail.pl	25 Jan 2005 17:13:24 -0000	1.16
***************
*** 73,77 ****
  				subscriptionid => $subscriptionid,
  );
!   ## get Amazon.com stuff
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
--- 73,78 ----
  				subscriptionid => $subscriptionid,
  );
!   ## Amazon.com stuff
! =head
  my $isbn=$dat->{'isbn'};
  my $amazon_details = &get_amazon_details($isbn);
***************
*** 101,103 ****
--- 102,105 ----
  $template->param( REVIEWS => \@reviews );
    ## End of Amazon Stuff
+ =cut
  output_html_with_http_headers $query, $cookie, $template->output;




From joshferraro at users.sourceforge.net  Tue Jan 25 18:23:35 2005
From: joshferraro at users.sourceforge.net (Joshua Ferraro)
Date: Tue, 25 Jan 2005 09:23:35 -0800
Subject: [Koha-cvs] CVS: koha/C4 Amazon.pm,1.1,1.2
Message-ID: <E1CtUPf-0002vh-TV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11210

Modified Files:
	Amazon.pm 
Log Message:
Added some minimal docs to Amazon.pm


Index: Amazon.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Amazon.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Amazon.pm	25 Jan 2005 16:53:28 -0000	1.1
--- Amazon.pm	25 Jan 2005 17:23:33 -0000	1.2
***************
*** 23,27 ****
  # FIXME: need to write up more docs.
  #
! 
  use strict;
  require Exporter;
--- 23,38 ----
  # FIXME: need to write up more docs.
  #
! # To use this module you need to do three things:
! # 1. get a dev key and associate tag from Amazon
! # 2. uncomment the Amazon stuff in opac-detail.pl
! # 3. add the template variables to opac-detail.tmpl
! #    here's what's available: 
! #    ProductDescription
! #    ImageUrlMedium
! #    ListPrice
! #    url
! #    loop SimilarProducts (Product)
! #    loop Reviews (rating, Summary)
! #
  use strict;
  require Exporter;




From oleonard at users.sourceforge.net  Tue Jan 25 22:29:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:29:18 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,NONE,1.1.2.1 opac-detailprint.tmpl,NONE,1.1.2.1 opac-serial-issues.tmpl,NONE,1.1.2.1 opac-ISBDdetail.tmpl,1.1,1.1.2.1 opac-detail.tmpl,1.1,1.1.2.1 opac-search.tmpl,1.1,1.1.2.1 opac-searchresults.tmpl,1.1,1.1.2.1 opac-user.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtYFS-0001Rr-Fz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5141/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-ISBDdetail.tmpl opac-detail.tmpl opac-search.tmpl 
	opac-searchresults.tmpl opac-user.tmpl 
Added Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl opac-detailprint.tmpl 
	opac-serial-issues.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

--- NEW FILE ---
<!-- TMPL_INCLUDE Name="popup-top.inc" -->
<div id="mainbloc">
<h1>Add book to bookshelf</h1> 
<p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
<p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
<h2>Select bookshelf</h2>
<form>
	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
</form>
<form>
<h2>or add to a new bookshelf</h2>
	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
		<select name="category">
			<option value="1">Private</option>
			<option value="2">Public</option>
			<option value="3">Free</option>
		</select>
	</p>
	<input type="submit" value="Add to virtual shelf" class="button catalogue">
</form>
<!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

--- NEW FILE ---
<html>
<body onLoad="window.print();self.close();">
<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
	<table cellspacing="0" cellpadding="1" border="1" width=500>
	<tr valign="top">
		<td bgcolor="#cccc99" background="/images/background-mem.gif">
			<b>BIBLIO RECORD <!-- TMPL_VAR NAME="biblionumber" --></b>
		</td>
	</tr>
	<tr valign="top">
		<td>
			<!-- TMPL_VAR NAME="author" --><br>
			<b><!-- TMPL_VAR NAME="title" --></b><!-- TMPL_VAR NAME="subtitle" --><br>
			<!-- TMPL_VAR NAME="additional" --><br>
			<!-- TMPL_IF NAME="publishercode" --><b>Published by :</b><!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="publicationyear" --><b>in </b><!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
			<!-- TMPL_IF NAME="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="pages" -->
			<!-- TMPL_IF NAME="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR NAME="size" --><br>
			<!-- TMPL_IF NAME="collection" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="subject" --><b>Subject:</b> <!-- TMPL_VAR NAME="subject" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF --> <br>
			<!-- TMPL_IF NAME="dewey" --><b>Dewey:</b> <a href="/cgi-bin/koha/opac-searchresults.pl?type=opac&amp;dewey=<!-- TMPL_VAR NAME="dewey" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="dewey" --></a><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="classification" --><b>Classification:</b> <!-- TMPL_VAR NAME="classification" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="lccn" --><b>LCCN:</b> <!-- TMPL_VAR NAME="lccn" --><!-- /TMPL_IF --><br>
			<!-- TMPL_IF NAME="url" --><b>URL:</b> <a href="<!-- TMPL_VAR NAME="url" -->"><!-- TMPL_VAR NAME="url" --></a><!-- /TMPL_IF --><br>
			<b>ISBN:</b><!-- TMPL_VAR NAME="ISBN" --><br>
			</font>
		</td>
	</tr>
	</table>
<!-- /TMPL_LOOP -->

<table border="0" cellspacing="0" cellpadding="2">
	<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
		<tr>
			<td><!-- TMPL_VAR NAME="description" --></td>
			<td><!-- TMPL_VAR NAME="branchname" -->, <!-- TMPL_VAR NAME="itemcallnumber" --></td>
			<td><!-- TMPL_VAR NAME="barcode" --></td>
			<td><!-- TMPL_VAR NAME="volumeddesc" --></td>
		</tr>
	<!-- /TMPL_LOOP -->
</table>
<script language="javascript" type="text/javascript">
function docprint() {
	window.print();
	window.close();
}
</script>
</body>
</html>
--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<!--------------------------MAIN BODY OF PAGE-------------------------->
<div id="mainbloc">
<h1 class="catalogue">Issues for a subscription</h1>
<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">Back to biblio</a>
<form method="post" name="f">
<!-- TMPL_LOOP name="subscription_LOOP" -->
<div id="bloc60">
	<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
		<p>It began on <b><!-- TMPL_VAR name="startdate" --></b> and is issued every
		<b>
		<!--TMPL_IF name="periodicity1" -->
				day
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity2" -->
				week
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity3" -->
				2 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity4" -->
				3 weeks
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity5" -->
				month
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity6" -->
				2 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity7" -->
				3 months
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity8" -->
				quarter
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity9" -->
				2 quarters
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity10" -->
				year
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="periodicity11" -->
				2 years
		<!-- /TMPL_IF -->
		</b>
		on
		<b>
		<!--TMPL_IF name="arrival1" -->
			Monday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival2" -->
				Tuesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival3" -->
				Wednesday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival4" -->
				Thursday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival5" -->
				Friday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival6" -->
				Saturday
		<!-- /TMPL_IF -->
		<!--TMPL_IF name="arrival7" -->
				Sunday
		<!-- /TMPL_IF -->
		</b>
		for <b>
			<!-- TMPL_IF name="numberlength" --><!-- TMPL_VAR name="numberlength" --> issues<!-- /TMPL_IF -->
			<!-- TMPL_IF name="weeklength" --><!-- TMPL_VAR name="weeklength" --> weeks<!-- /TMPL_IF -->
			<!-- TMPL_IF name="monthlength" --><!-- TMPL_VAR name="monthlength" --> months<!-- /TMPL_IF -->
			</b>
		since <b><!-- TMPl_VAR name="startdate" --></b>
		</p>
		<p><!-- TMPL_VAR name="notes" --></p>
	<!-- TMPL_IF name="opacnotes" -->
		<h2 class="catalogue">Issues summary</h2>
		<p>
			<!-- TMPL_VAR name="opacnote" -->
		</p>
	<!-- /TMPL_IF -->
</div>
<!-- /TMPL_LOOP -->
</div>

<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-ISBDdetail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-ISBDdetail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-ISBDdetail.tmpl	25 Jan 2005 21:28:57 -0000	1.1.2.1
***************
*** 3,26 ****
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Normal
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		MARC
! 	</a>
! 	<a href="javascript:Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
  	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! </div>
  
! <div id="mainbloc">
! 	<p>ISBD : <!-- TMPL_VAR name="ISBD" --></p>
  </div>
  </body>
--- 3,28 ----
  <!--TMPL_INCLUDE NAME="masthead.inc" -->
  <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! 	<div class="details"><h3>ISBD</h3>
! 	<p><!-- TMPL_VAR name="ISBD" --></p>
! 	
  	<!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="submit" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-detail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon brief" value="Simple View" /></form>
  
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
  </div>
  </body>

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-detail.tmpl	20 Oct 2004 19:15:06 -0000	1.1
--- opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
***************
*** 1,60 ****
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
! </div>
!  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
! <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="subjects" -->	
! 		<tr><th>Subject(s):</th><td> <!-- TMPL_LOOP NAME="SUBJECTS" -->
! 	: <a href="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="SUBJECTS" ESCAPE="URL" -->"><!-- TMPL_VAR NAME=SUBJECTS --></a>  
! 	<!-- /TMPL_LOOP --></td></tr>
! 		<!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
--- 1,90 ----
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
  
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
  	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
! </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
  		<tr>
+ 			<td>
+ 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
+ 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
+ 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
+ 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
+ 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
+ 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
+ 					<!-- TMPL_LOOP name="subjects" -->
+ 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
+ 					<br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
+ 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
+ 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
+ 			</td>
+ 		</tr>
+ 	</table>
+ 
+ 
+ 	<!-- /TMPL_LOOP -->
+ 		<table>
+ 	<!-- TMPL_IF name="MARCNOTES" -->
+ 	<tr>
  			<th><i>Detailed notes:</i></th>
  			<td>
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
  		</tr>
+ 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
***************
*** 62,118 ****
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
- 	</table>
- 
- <TMPL_UNLESS NAME="norequests">
-     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
-     <input type="submit" name="submit"  VALUE="Place Reserve" class="submit" />
-     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-     </form>
- </TMPL_UNLESS>
- <!--  <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="isbd" value="ISBD" /></form> -->
  
! <!-- <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="detail" value="MARC View" /></form> -->
! 
! <!-- <form class="inline" action="detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="print" value="Print" onclick="Dopop('detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form> -->
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
! </div>
  </div>
! </body>
! </html>
! 
--- 92,143 ----
  				<ul>
  					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
  					<!-- /TMPL_LOOP -->
  				</ul>
  			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
! 	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
! 	<!-- /TMPL_IF -->
! 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->

Index: opac-search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-search.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-search.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-search.tmpl	25 Jan 2005 21:28:59 -0000	1.1.2.1
***************
*** 11,15 ****
  <div class="form">
  <table>
! <tr><th><label>Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
--- 11,15 ----
  <div class="form">
  <table>
! <tr><th><label for="keyword">Keyword</label></th><td><input type="hidden" name="op" value="do_search" />
  			<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
  		<input type="hidden" name="marclist" value="" />
***************
*** 17,53 ****
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label>Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <!-- <tr><th><label class="label20">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="contains" />
! 				<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Illustrator</label></th><td><input type="hidden" name="marclist" value="biblioitems.illus" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label class="label20">Dewey</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" name="value" onchange="sql_update()" /></td></tr> -->
! <tr><th><label class="label20">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label class="label20">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
--- 17,50 ----
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="keyword" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="title">Title</label></th><td><input type="hidden" name="marclist" value="biblio.title" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="title" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="author">Author</label></th><td><input type="hidden" name="marclist" value="biblio.author" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="author" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="subject">Subject</label></th><td>			
! 			<input type="hidden" name="marclist" value="bibliosubject.subject" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />  
! 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" /></td></tr>
! <tr><th><label for="seriestitle">Series title</label></th><td>			
! 			<input type="hidden" name="marclist" value="biblio.seriestitle" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="seriestitle" name="value" onchange="sql_update()" size="35"/></td></tr>
! 
! <tr><th><label for="itemtype">Format</label></th><td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
  			<input type="hidden" name="and_or" value="and" />
  			<input type="hidden" name="excluding" value="" />
  			<input type="hidden" name="operator" value="=" />
  			<!-- TMPL_VAR name="CGIitemtype" --></td></tr>
! <tr><th><label for="branch">Location</label></th><td><input type="hidden" name="marclist" value="items.holdingbranch" />
  				<input type="hidden" name="and_or" value="and" />
  				<input type="hidden" name="excluding" value="" />
***************
*** 55,59 ****
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! 
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
--- 52,89 ----
  				<!-- TMPL_VAR name="CGIbranch" --></td></tr>
  </table>			
! <table>
! <caption>Other options:</caption>
! <tr><th><label for="barcode">Barcode</label></th><td>
! 				<input type="hidden" name="marclist" value="items.barcode" />
! 				<input type="hidden" name="and_or" value="and" />
! 				<input type="hidden" name="excluding" value="" />
! 				<input type="hidden" name="operator" value="=" />
! 				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" /></td></tr>
! <tr><th><label for="dewey">Call Number</label></th><td><input type="hidden" name="marclist" value="biblioitems.dewey" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="dewey" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="isbn">ISBN</label></th><td><input type="hidden" name="marclist" value="biblioitems.isbn" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="start" />
! 			<input type="text" id="isbn" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="publisher">Publisher</label></th><td><input type="hidden" name="marclist" value="biblioitems.publishercode" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="contains" />
! 			<input type="text" id="publisher" name="value" onchange="sql_update()" /></td></tr>
! <tr><th><label for="pubbetween">Published between</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value=">=" />
! 			<input type="text" id="pubbetween" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! <tr><th><label for="puband">...and</label></th><td><input type="hidden" name="marclist" value="biblioitems.publicationyear" />
! 			<input type="hidden" name="and_or" value="and" />
! 			<input type="hidden" name="excluding" value="" />
! 			<input type="hidden" name="operator" value="<=" />
! 			<input type="text" id="puband" name="value" size="6" maxlength="4" onchange="sql_update()" /></td></tr>
! </table>
  		<p>Results per page :
  			<select name="resultsperpage" size="1">
***************
*** 77,89 ****
  </form>
  
- <h3>Search by Subject</h3>
- <form action="http://koha.athenscounty.lib.oh.us/cgi-bin/koha/opac-searchresults.pl" method="post">
- <div class="form">
- <table>
-  <tr><th><label for="subject">Subject</label></th><td><input type="text"  id="subject" size="25"   name="subject" /></td></tr>
- </table><input type="submit" value="Search" class="submit" />
- </div>
- </form>
- 
  <script type="text/javascript">
  function sql_update() {
--- 107,110 ----

Index: opac-searchresults.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-searchresults.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-searchresults.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-searchresults.tmpl	25 Jan 2005 21:29:00 -0000	1.1.2.1
***************
*** 86,95 ****
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL -->
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
! <!-- /Display for NPL -->
  </div> 
  
--- 86,95 ----
  				<!-- /TMPL_IF --></div>
  
! <!-- Display for NPL 
  	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
  </div>
!  /Display for NPL -->
  </div> 
  
***************
*** 98,105 ****
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL -->	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div><!-- /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>
--- 98,105 ----
  <!-- TMPL_ELSE -->
  Sorry, there were no results.
! <!-- Display for NPL 	<div class="note">
  Not finding what you're looking for?<br />  Make a <a href="http://www.athenscounty.lib.oh.us/ipage.html">
  purchase suggestion</a>
! </div> /Display for NPL -->
  <!-- /TMPL_IF -->
  </div>

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-user.tmpl	19 Jan 2005 17:43:58 -0000	1.1.2.1
--- opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
***************
*** 128,132 ****
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 128,132 ----
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From oleonard at users.sourceforge.net  Tue Jan 25 22:39:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:39:18 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.3.2.1
Message-ID: <E1CtYP8-00024f-NN@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7863/opac

Modified Files:
      Tag: rel_2_2
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:39:13 -0000	1.3.2.1
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:40:41 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:40:41 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-basket.pl,1.3,1.4
Message-ID: <E1CtYQT-0002An-G3@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8316/opac

Modified Files:
	opac-basket.pl 
Log Message:
Adding verbose parameter to allow for more detailed view in opac basket (requires update to opac-basket.tmpl to take advantage of added functionality)

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-basket.pl	12 Jul 2004 18:58:47 -0000	1.3
--- opac-basket.pl	25 Jan 2005 21:40:38 -0000	1.4
***************
*** 21,25 ****
--- 21,27 ----
  my $bib_list=$query->param('bib_list');
  my $print_basket=$query->param('print');
+ my $verbose = $query->param('verbose');
  
+ if($verbose) { $template->param(verbose => 1); }
  if ($print_basket) { $template->param(print_basket => 1); }
  




From oleonard at users.sourceforge.net  Tue Jan 25 22:52:44 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:52:44 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.1.2.1
Message-ID: <E1CtYc8-0002x7-Hv@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11296/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:52:29 -0000	1.1.2.1
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 22:53:42 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 13:53:42 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-sendbasketform.tmpl,1.1,1.2
Message-ID: <E1CtYd4-00030J-No@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11505/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-sendbasketform.tmpl 
Log Message:
Correcting class names of submit buttons

Index: opac-sendbasketform.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-sendbasketform.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-sendbasketform.tmpl	20 Oct 2004 19:15:07 -0000	1.1
--- opac-sendbasketform.tmpl	25 Jan 2005 21:53:33 -0000	1.2
***************
*** 16,25 ****
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>
--- 16,25 ----
  <p>		<label for="email_add">E-mail Address:</label> <input type="text" id="email_add" name="email_add" size="35" /></p>
  	
! <p><input type="submit" value="Send" class="icon send" />
  	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" /></p>
  </form>
  <!-- /TMPL_IF -->
  	
! </div><p><form action="opac-sendbasket.pl" method="get" /><input type="submit" class="icon close" value="Close Window" onclick="window.close(); return false;" /></form></p>
  </div>
  </body>




From oleonard at users.sourceforge.net  Tue Jan 25 23:42:58 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:42:58 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZOk-00063A-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23226/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-addbookbybiblionumber.tmpl	25 Jan 2005 21:29:02 -0000	1.1.2.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:42:53 -0000	1.1.2.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Tue Jan 25 23:45:11 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:45:11 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CtZQt-0006Am-0Q@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23647/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
Many updates, corrections, etc. to bring in line with default (css) template

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-detail.tmpl	25 Jan 2005 21:28:58 -0000	1.1.2.1
--- opac-detail.tmpl	25 Jan 2005 22:45:05 -0000	1.1.2.2
***************
*** 1,143 ****
! <!-- TMPL_INCLUDE NAME="opac-top.inc" -->
! <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
! 
! <div id="bibliomenu">
! 	<a href="opac-detail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		Simple
! 	</a>
! 	<a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button">
! 		Complete
! 	</a>
! 	<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
! 		ISBD
! 	</a>
! 	<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
! 		Add to shelf
! 	</a>
! 	<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
! 		Print
! 	</a>
! 	<!-- TMPL_UNLESS NAME="norequests" -->
! 		<a class="button" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->">
! 			Request
! 		</a>
! 	<!-- /TMPL_UNLESS -->
! 	<!-- TMPL_IF name="subscriptionid" -->
! 	<a href="opac-serial-issues.pl?subscriptionid=<!-- TMPL_VAR NAME="subscriptionid" -->" class="button catalogue" title="Serial issues">
! 		Issues
! 	</a>
! 	<!-- /TMPL_IF -->
! 	<a class="button" href="javascript:addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE=URL -->')">Add to basket</a>
  </div>
  
! <div id="mainbloc">
! 	<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! 	<h1><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="class" --></h1>
! 
! 	<p>
! 	<div id="bibliobloc">
! 	<table cellspacing="0">
! 		<!-- BIBLIO RECORD TABLE -->
! 		<tr>
! 			<th>
! 				<!-- TMPL_VAR NAME="title" -->  (record <!-- TMPL_VAR NAME="biblionumber" -->)
! 			</th>
! 		</tr>
! 		<tr>
! 			<td>
! 				<!-- TMPL_IF name="subtitle" --><b>Subtitle:</b><!-- TMPL_VAR NAME="subtitle" --><br /><!-- /TMPL_IF --> 
! 				<!-- TMPL_IF name="author" --><b>Author:</b> <!-- TMPL_VAR NAME="author" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="additional" --><b>Additional Author:</b><!-- TMPL_VAR NAME="additional" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="publishercode" --><b>Published by :</b><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
! 				<!-- TMPL_IF name="publicationyear" --><b>in </b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
! 				<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
! 				<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" --><br />
! 				<!-- TMPL_IF name="isbn" --><b>ISBN:</b> <!-- TMPL_VAR NAME="isbn" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><b>Collection:</b> <!-- TMPL_VAR NAME="seriestitle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><b>Subject(s):</b> 
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP -->
! 					<br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="copyrightdate" --><b>Year :</b> <!-- TMPL_VAR NAME="copyrightdate" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><b>Notes:</b> <!-- TMPL_VAR NAME="notes" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="unititle" --><b>Unititle:</b> <!-- TMPL_VAR NAME="unititle" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="dewey" --><b>Dewey:</b><!-- TMPL_VAR name="dewey" --><br /><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><b>URL:</b> <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a><br /><!-- /TMPL_IF -->
! 				<b>Item type : </b><!-- TMPL_VAR NAME="itemtype" --><br/>
! 				<b>Total Number of Items:</b> <!-- TMPL_VAR NAME="count" -->
! 			</td>
! 		</tr>
! 	</table>
  
  
! 	<!-- /TMPL_LOOP -->
! 		<table>
! 	<!-- TMPL_IF name="MARCNOTES" -->
! 	<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<li><i><!-- TMPL_VAR NAME="marcnote" --></i></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
! 		<!-- TMPL_ELSE --><tr><td colspan="2">No Detailed Notes</td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF name="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						<li><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="marcsubjct" -->	</a></li>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr><!-- TMPL_ELSE -->
! 		<tr><td colspan="2">No Related Links</td></tr>
  	<!-- /TMPL_IF -->
  
! 	</table>	</div>
! 	<div id="itembloc">
! 	<table cellspacing="0">
! 		<tr>
! 			<th colspan="6">Item</th>
! 		</tr>
! 		<tr>
! 			<th>Location</th>
! 			<th>Date Due</th>
! 			<th>Last Seen</th>
! 			<th>Barcode</th>
! 		</tr>
! 		<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --></td>
! 				<td><!-- TMPL_VAR NAME="datedue" --></td>
! 				<td><!-- TMPL_VAR NAME="datelastseen" --></td>
! 				<td><!-- TMPL_VAR NAME="barcode" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 		<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
! 			<tr>
! 				<td><!-- TMPL_VAR NAME="itemtype" --></td>
! 				<td>Website</td>
! 				<td>Online</td>
! 				<td>Available</td>
! 				<td>&nbsp;</td>
! 				<td><!-- TMPL_VAR NAME="url" --></td>
! 			</tr>
! 		<!-- /TMPL_LOOP -->
! 	</table>
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>
! 			This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions). You can see which 
! 				<a href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" class="button catalogue" title="Serial issues">
! 					Issues
! 				</a> we have and don't have
! 		</p>
  	<!-- /TMPL_IF -->
- 	</div>
  </div>
! <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
--- 1,109 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
! <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <!--TMPL_INCLUDE NAME="masthead.inc" -->
! <!--TMPL_INCLUDE NAME="navigation.inc" -->
! 
! <div id="main">
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <div class="details">
! <!-- Display for NPL 			<div style="float: right; padding: 5px;">
! <img src="/cgi-bin/koha/imgcheck.pl?image_location=/usr/local/images2/<!-- TMPL_VAR NAME="isbn" -->.jpg" alt="Book Cover Image" />
  </div>
+  /Display for NPL --><h2><!-- TMPL_VAR NAME="title" --></h2>
+ <!-- TMPL_IF NAME="author" --><h3 class="author">By <!-- TMPL_VAR NAME="author" --></h3><!-- /TMPL_IF --> 
  
! <table>
! <!-- TMPL_IF NAME="subtitle" --><tr><th>Subtitle: </th><td><!-- TMPL_VAR NAME="subtitle" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="abstract" --><tr><th>Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="copyrightdate" -->
!     <tr><th>Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="isbn" -->
! 	    <tr><th>ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="lccn" -->
! 	    <tr><th>LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="publishercode" -->
! 	    <tr><th>Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
! 	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
  
+ <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
+  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
! 		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
+ </table>
  
! <!-- TMPL_UNLESS NAME="norequests" -->
!     <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
!     <input type="submit" name="submit"  value="Place Reserve" class="icon reserve" />
!     <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
!     </form>
! <!-- /TMPL_UNLESS -->
! 
! <form class="inline" action="opac-MARCdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon detail" value="MARC View" /></form>
! 
! <form class="inline" action="opac-ISBDdetail.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD" /></form>
! 
! <form class="inline" action="opac-detailprint.pl" method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit" class="icon print" value="Print" onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->'); return false;"/></form>
! 
! <form class="inline" action="opac-addbookbybiblionumber.pl" method="get"><input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /><input type="submit" class="icon shelf" value="Add to Shelf" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;" /></form>
! 
! <form class="inline"><input type="submit" class="icon cart" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->'); return false;" value="Add to Book Bag" /></form>
! </div>
! 
! <!-- TMPL_IF NAME="ITEM_RESULTS" -->
! <div class="table"><table>
! <!--HOLDINGS INFORMATION HEADER TABLE ROWS-->
! <tr><!-- <th>&nbsp;</th> -->
! <th>Type/Format</th>
! <th>Call Number</th>
! <th>Location</th>
! <th>Due Date</th>
! <th>Last Seen</th>
! <!-- <th>Barcode</th> --></tr>
! <tbody>
! <!--INFORMATION ROWS-->
! <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
! <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
! <td><!-- TMPL_VAR NAME="branchname" --></td>
! <td><!-- TMPL_VAR NAME="datedue" --></td>
! <td><!-- TMPL_VAR NAME="datelastseen" --></td>
! <!-- <td><!-- TMPL_VAR NAME="barcode" --></td> --></tr>
! <!-- /TMPL_LOOP -->
! </tbody>
! </table>
! <!-- TMPL_ELSE -->
! <table><tr><td>No copies available.</td></tr></table>
! <!-- /TMPL_IF -->
  	<!-- TMPL_IF name="subscriptionsnumber" -->
! 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title). You can see which <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Issues</a> we have and don't have</p>
  	<!-- /TMPL_IF -->
  </div>
! </div>
! </body>
! </html>
! 




From oleonard at users.sourceforge.net  Tue Jan 25 23:47:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:47:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-detail.tmpl,1.2,1.3
Message-ID: <E1CtZT3-0006JE-GR@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24220/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-detail.tmpl 
Log Message:
Synching with default template, other cosmetic changes

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-detail.tmpl	24 Jan 2005 22:51:52 -0000	1.2
--- opac-detail.tmpl	25 Jan 2005 22:47:21 -0000	1.3
***************
*** 29,72 ****
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF NAME="marcnotes" -->
! <tr><th>Notes:</th><td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnotes" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! <!-- TMPL_IF name="subjects" -->
! 		<!-- TMPL_LOOP name="subjects" -->
! 		<tr><th>Subject(s):</th><td><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a></td></tr><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
! <!-- <tr><th>Biblio Record:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> -->
! </table>
  
! 	<table border="1">
! 	<!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th><i>Detailed notes:</i></th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td>
! 				<ul>
! 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 							<!-- TMPL_VAR NAME="marcsubjct" -->
! 						</a><br>
! 					<!-- /TMPL_LOOP -->
! 				</ul>
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 	</table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
--- 29,59 ----
  <!-- /TMPL_IF -->
  <!-- TMPL_IF NAME="pages" -->
! 	<tr><th>Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr>
  <!-- /TMPL_IF -->
! <!-- TMPL_IF NAME="notes" -->
! <tr><th>Notes:</th><td><div class="notes"><!-- TMPL_VAR NAME="notes" --></div></td></tr>
  	<!-- /TMPL_IF -->
! 	<!-- /TMPL_LOOP -->
! 	
! <!-- TMPL_UNLESS NAME="MARCSUBJCTS" -->
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
! <!-- TMPL_IF name="subjects" --><tr><th>Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&amp;marclist=bibliosubject.subject&amp;and_or=and&amp;operator=contains&amp;value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF -->
! <!-- /TMPL_LOOP -->
! <!-- /TMPL_UNLESS -->
! 
! <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
!  <tr><th>Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP -->
  
! <!-- TMPL_IF NAME="MARCNOTES" -->
  		<tr>
! 			<th>Detailed notes:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! 		<!-- TMPL_IF NAME="MARCSUBJCTS" -->
  		<tr>
  			<th>Related links:</th>
! 			<td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr>
  	<!-- /TMPL_IF -->
! </table>
  
  <!-- TMPL_UNLESS NAME="norequests" -->
***************
*** 102,106 ****
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="class" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>
--- 89,93 ----
  <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
  <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
! <td><!-- TMPL_VAR NAME="classification" --></td>
  <td><!-- TMPL_VAR NAME="branchname" --></td>
  <td><!-- TMPL_VAR NAME="datedue" --></td>




From oleonard at users.sourceforge.net  Tue Jan 25 23:48:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:48:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1,1.1.2.1
Message-ID: <E1CtZUT-0006NL-9R@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24421/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** opac.css	20 Oct 2004 19:15:06 -0000	1.1
--- opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;
***************
*** 518,521 ****
--- 527,542 ----
  }
  
+ input.isbd {
+ 	background-image: url(../images/isbd.gif);
+ }
+ 
+ input.shelf {
+ 	background-image: url(../images/addtoshelf.gif);
+ }
+ 
+ input.reserve {
+ 	background-image: url(../images/placereserve.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Tue Jan 25 23:49:23 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:49:23 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1.2.1,1.1.2.2
Message-ID: <E1CtZUx-0006Of-WD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24508/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	script.js 
Log Message:
Adding Dopop function for virtual shelves popup

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** script.js	11 Jan 2005 22:47:17 -0000	1.1.2.1
--- script.js	25 Jan 2005 22:49:09 -0000	1.1.2.2
***************
*** 60,62 ****
  		return false;
  	}
! }
\ No newline at end of file
--- 60,66 ----
  		return false;
  	}
! }
! 
! function Dopop(link) {
! 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
! 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:53:50 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:53:50 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes script.js,1.1,1.2
Message-ID: <E1CtZZG-0006fN-AF@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25604/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	script.js 
Log Message:
Three new functions: CheckAll, which toggles checkboxes in results lists; confirmDelete, which offers a warning before proceding with an action; Dopop, for popping up virtual shelves window

Index: script.js
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/script.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** script.js	20 Oct 2004 19:15:06 -0000	1.1
--- script.js	25 Jan 2005 22:53:46 -0000	1.2
***************
*** 39,40 ****
--- 39,66 ----
    }
  }
+ 
+ function CheckAll()
+ {
+ count = document.mainform.elements.length;
+     for (i=0; i < count; i++) 
+ 	{
+ 	    if(document.mainform.elements[i].checked == 1){
+ 			document.mainform.elements[i].checked = 0;
+ 		} else {
+ 			document.mainform.elements[i].checked = 1;
+ 		}
+ 	}
+ }
+ 
+ function confirmDelete(message) {
+ 	var agree = confirm(message);
+ 	if(agree) {
+ 		return true;
+ 	} else {
+ 		return false;
+ 	}
+ }
+ 
+ function Dopop(link) {
+ 	newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
+ 	}
\ No newline at end of file




From oleonard at users.sourceforge.net  Tue Jan 25 23:55:09 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:55:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.2,1.3
Message-ID: <E1CtZaX-0006lB-OA@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25811/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Updating and refining various styles

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac.css	24 Jan 2005 22:54:02 -0000	1.2
--- opac.css	25 Jan 2005 22:54:57 -0000	1.3
***************
*** 220,225 ****
  }
  
! p.error {
! 	color : #990000;
  	font-size : 1.05em;
  	font-weight : normal;
--- 220,226 ----
  }
  
! p.error, div.error {
! 	background-color : #FFFFCC;
! 	border : 1px solid #660000;
  	font-size : 1.05em;
  	font-weight : normal;
***************
*** 227,230 ****
--- 228,239 ----
  }
  
+ div.error h3 {
+ 	color : #990000;
+ }
+ 
+ div.error li {
+ 	margin-bottom : .5em;
+ }
+ 
  table {
  	background-color : #FFFFCC;




From oleonard at users.sourceforge.net  Tue Jan 25 23:56:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Tue, 25 Jan 2005 14:56:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-addbookbybiblionumber.tmpl,1.1,1.2
Message-ID: <E1CtZbx-0006qL-Nw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26214/koha-tmpl/opac-tmpl/npl/en

Modified Files:
	opac-addbookbybiblionumber.tmpl 
Log Message:
Synching with default template

Index: opac-addbookbybiblionumber.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-addbookbybiblionumber.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-addbookbybiblionumber.tmpl	24 Jan 2005 22:51:52 -0000	1.1
--- opac-addbookbybiblionumber.tmpl	25 Jan 2005 22:56:27 -0000	1.2
***************
*** 1,22 ****
! <!-- TMPL_INCLUDE Name="popup-top.inc" -->
! <div id="mainbloc">
! <h1>Add book to bookshelf</h1> 
! <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
! <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
! <h2>Select bookshelf</h2>
! <form>
! 	<p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
! </form>
! <form>
! <h2>or add to a new bookshelf</h2>
! 	<p><input type="text" name="newbookshelf" maxlength=40 size=40>
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
! 		<select name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select>
! 	</p>
! 	<input type="submit" value="Add to virtual shelf" class="button catalogue">
  </form>
! <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->
--- 1,31 ----
! <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- Add to Virtual Shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
! <div id="window">
! <div class="details">
! <table>
! <caption>Add Item to Virtual Shelf</caption>
! <tr><th>Title</th><td><!-- TMPL_VAR NAME="title" --></td></tr>
! <!-- TMPL_IF NAME="author" --><tr><th>Author</th><td><!-- TMPL_VAR NAME="author" --></td></tr><!-- /TMPL_IF -->
! </table>
! 
! <form action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="post">
! <table>
! <caption>Select Virtual Shelf:</caption>
! <tr><th><label for="shelfnumber">Add to virtual shelf</label></th><td><!-- TMPL_VAR NAME="CGIbookshelves" --></td></tr>
! </table>
! 
! <table>
! <caption>...or add to a new bookshelf:</caption>
! <tr><th><label for="newbookshelf">Shelf Name:</label> </th><td><input type="text" id="newbookshelf" name="newbookshelf" maxlength="40" size="40">
! 	<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"></td></tr>
! <tr><th><label for="category">Shelf Type: </label></th><td><select id="category" name="category">
  			<option value="1">Private</option>
  			<option value="2">Public</option>
  			<option value="3">Free</option>
! 		</select></td></tr>
! </table>
! 	<p><input type="submit" value="Add to Virtual Shelf" class="submit"></p>
  </form>
! </div>
! </div>
! </body>
! </html>




From oleonard at users.sourceforge.net  Wed Jan 26 17:39:25 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Wed, 26 Jan 2005 08:39:25 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en/includes opac.css,1.17,1.17.2.1
Message-ID: <E1CtqCT-0003no-Me@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14532/koha-tmpl/opac-tmpl/css/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Minor corrections to syntax there and there.  Shouldn't affect display.

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/includes/opac.css,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -r1.17 -r1.17.2.1
*** opac.css	3 Jan 2005 11:08:36 -0000	1.17
--- opac.css	26 Jan 2005 16:39:23 -0000	1.17.2.1
***************
*** 1,5 ****
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica;
  	font-size:12pt;
  	margin:0px;
--- 1,5 ----
  body {
  	background-color:#009999;
! 	font-family:verdana,arial,helvetica,sans-serif;
  	font-size:12pt;
  	margin:0px;
***************
*** 276,281 ****
  #leftbloc {
  	float:left;
! 	width=30%;
! 	border:1;
  }
  
--- 276,281 ----
  #leftbloc {
  	float:left;
! 	width:30%;
! 	border:0;
  }
  
***************
*** 293,297 ****
  	float:left;
  	width:30%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 293,296 ----
***************
*** 301,305 ****
  	float:left;
  	width:60%;
- 	border:0;
  	border:1px solid #000000;
  	margin-right:20px;
--- 300,303 ----
***************
*** 391,395 ****
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;
--- 389,393 ----
  	font-weight:bold;
  	color:#FF6600;
! 	background-color:#FFFFFF;
  	background-image:none;
  	border-bottom: thin solid #FF6600;




From acli at users.sourceforge.net  Thu Jan 27 08:11:41 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Wed, 26 Jan 2005 23:11:41 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.11,1.4.2.12
Message-ID: <E1Cu3ob-0005vh-Al@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22754

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.11
retrieving revision 1.4.2.12
diff -C2 -r1.4.2.11 -r1.4.2.12
*** default_intranet_zh_TW.po	25 Jan 2005 05:31:53 -0000	1.4.2.11
--- default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
***************
*** 59,64 ****
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/aqbookfund.tmpl:9
  msgid ""
--- 59,65 ----
  "\"A\" (Adult) and \"W\" can be linked as \"guarantors\" to other borrowers "
  "who are their dependents."
! msgstr "???????????????A?????????????????????W??????????????????????????????????????????????????????????????????????????????????????????"
[...1075 lines suppressed...]
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "???????????????????????????????????????branches"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
- #, fuzzy
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "???????????????????????????????????????itemtype"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45
--- 20871,20880 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:81
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:95
  msgid "the correspounding subfield MUST have authorised value=\"branches\""
! msgstr "??????????????????????????????????????????branches???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl:55
  msgid "the correspounding subfield MUST have authorised_value=\"itemtype\""
! msgstr "??????????????????????????????????????????itemtype???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:45




From oleonard at users.sourceforge.net  Thu Jan 27 18:18:31 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:18:31 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.3.2.2,1.3.2.3
Message-ID: <E1CuDHr-0008A6-Qw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348/opac

Modified Files:
      Tag: rel_2_2
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -C2 -r1.3.2.2 -r1.3.2.3
*** opac-shelves.pl	11 Jan 2005 20:18:29 -0000	1.3.2.2
--- opac-shelves.pl	27 Jan 2005 17:18:28 -0000	1.3.2.3
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
! my $headerbackgroundcolor='#663266';
! my $circbackgroundcolor='#555555';
! my $circbackgroundcolor='#550000';
! my $linecolor1='#bbbbbb';
! my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,38 ----
  my $env;
  my $query = new CGI;
! 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
***************
*** 63,68 ****
  
  $template->param({	loggedinuser => $loggedinuser,
! 					headerbackgroundcolor => $headerbackgroundcolor,
! 					circbackgroundcolor => $circbackgroundcolor });
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
--- 59,63 ----
  
  $template->param({	loggedinuser => $loggedinuser,
! 				});
  SWITCH: {
  	if ($query->param('op') eq 'modifsave') {
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.3.2.3  2005/01/27 17:18:28  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:27:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:27:15 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-shelves.pl,1.4,1.5
Message-ID: <E1CuDQJ-0000At-DI@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv648/opac

Modified Files:
	opac-shelves.pl 
Log Message:
Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-shelves.pl	13 Jan 2005 20:41:07 -0000	1.4
--- opac-shelves.pl	27 Jan 2005 17:27:11 -0000	1.5
***************
*** 34,42 ****
  my $env;
  my $query = new CGI;
- my $headerbackgroundcolor='#663266';
- my $circbackgroundcolor='#555555';
- my $circbackgroundcolor='#550000';
- my $linecolor1='#bbbbbb';
- my $linecolor2='#dddddd';
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
--- 34,37 ----
***************
*** 95,99 ****
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
--- 90,94 ----
  foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}= $color;
  		$line{'shelf'}=$element;
***************
*** 147,151 ****
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
--- 142,146 ----
  	foreach my $element (sort keys %$shelflist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'shelf'}=$element;
***************
*** 169,173 ****
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
--- 164,168 ----
  	foreach $item (sort {$a->{'barcode'} cmp $b->{'barcode'}} @$itemlist) {
  		my %line;
! 		($color eq 0) ? ($color=1) : ($color=0);
  		$line{'color'}=$color;
  		$line{'itemnumber'}=$item->{'itemnumber'};
***************
*** 190,193 ****
--- 185,191 ----
  #
  # $Log$
+ # Revision 1.5  2005/01/27 17:27:11  oleonard
+ # Taking table cell background color information out of the script and moving it into the template (requires update to opac-shelves.tmpl)
+ #
  # Revision 1.4  2005/01/13 20:41:07  oleonard
  # Adding call number and item type to list of returned variables




From oleonard at users.sourceforge.net  Thu Jan 27 18:30:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:30:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.2.2.1
Message-ID: <E1CuDSz-0000L0-MS@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1260/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:29:58 -0000	1.2.2.1
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 18:31:15 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 09:31:15 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-shelves.tmpl,1.2,1.3
Message-ID: <E1CuDUB-0000Qa-OE@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1633/koha-tmpl/opac-tmpl/css/en

Modified Files:
	opac-shelves.tmpl 
Log Message:
Changing toggle of background colors to go along with changes in opac-shelves.pl.  Also changing some id's to classes (id's cannot repeat within a document) and widening div that contains shelf list

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-shelves.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-shelves.tmpl	3 Jan 2005 11:09:33 -0000	1.2
--- opac-shelves.tmpl	27 Jan 2005 17:31:13 -0000	1.3
***************
*** 16,23 ****
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><a href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
--- 16,23 ----
  				<!-- TMPL_LOOP Name="itemsloop" -->
  					<tr>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="barcode" --></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><a class="transparent" href="opac-MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="author" --></td>
  					</tr>
  				<!-- /TMPL_LOOP -->
***************
*** 34,38 ****
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div id="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
--- 34,38 ----
  
  	<!-- TMPL_IF name="manageshelf" -->
! 	<div class="bloc20">
  		<form>
  		<h2>Add a book by barcode</h2>
***************
*** 58,62 ****
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div id="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
--- 58,62 ----
  			<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<div class="bloc20">
  					<h2>Select Shelves to Delete</h2>
  					<form method="post">
***************
*** 102,106 ****
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div id="bloc20">
  			<h2>Shelf list</h2>
  			<table class="small">
--- 102,106 ----
  		</div>
  	<!-- TMPL_ELSE -->
! 		<div class="bloc60">
  			<h2>Shelf list</h2>
  			<table class="small">
***************
*** 113,122 ****
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
! 						<a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_IF NAME="category1" -->
  							Private
--- 113,122 ----
  				<!-- TMPL_LOOP Name="shelvesloop" -->
  				<tr>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
! 						<a class="transparent" href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
  							<!-- TMPL_VAR NAME="shelfname" -->
  						</a>
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_IF NAME="category1" -->
  							Private
***************
*** 129,137 ****
  						<!-- /TMPL_IF -->
  					</td>
! 					<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td bgcolor="<!-- TMPL_VAR NAME="color" -->">
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
--- 129,137 ----
  						<!-- /TMPL_IF -->
  					</td>
! 					<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  						<!-- TMPL_VAR NAME="shelfbookcount" --> item(s)
  					</td>
  					<!-- TMPL_IF name="mine" -->
! 						<td<!-- TMPL_IF NAME="color" --> class="hilighted"<!-- /TMPL_IF -->>
  							<a href="opac-shelves.pl?op=modif&shelf=<!-- TMPL_VAR NAME="shelf" -->" class="button">Modify</a>
  							<!-- TMPL_VAR name="surname" --><!-- TMPL_VAR name="firstname" -->
***************
*** 142,146 ****
  			</table>
  		</div>
! 		<div id="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
--- 142,146 ----
  			</table>
  		</div>
! 		<div class="bloc20">
  			<a href="opac-shelves.pl?shelves=1" class="button">Add or Remove Book Shelves</a>
  		</div>
***************
*** 149,153 ****
  
  <!-- TMPL_IF name="edit" -->
! 	<div id="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">
--- 149,153 ----
  
  <!-- TMPL_IF name="edit" -->
! 	<div class="bloc20">
  		<form method="post">
  			<input type="hidden" name="op" value="modifsave">




From oleonard at users.sourceforge.net  Thu Jan 27 19:10:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:10:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.1.2.1,1.1.2.2
Message-ID: <E1CuE6I-0003Au-5W@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12182/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac.css	25 Jan 2005 22:48:47 -0000	1.1.2.1
--- opac.css	27 Jan 2005 18:10:34 -0000	1.1.2.2
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:11:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:11:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes opac.css,1.3,1.4
Message-ID: <E1CuE7G-0003Eu-I6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12411/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	opac.css 
Log Message:
Adding edit and delete input icons

Index: opac.css
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac.css	25 Jan 2005 22:54:57 -0000	1.3
--- opac.css	27 Jan 2005 18:11:36 -0000	1.4
***************
*** 143,147 ****
  	margin : 0 auto;
  	padding : 5px;
! 	width : 95%;
  }
  
--- 143,147 ----
  	margin : 0 auto;
  	padding : 5px;
! 	width : 100%;
  }
  
***************
*** 539,542 ****
--- 539,550 ----
  }
  
+ input.delete {
+ 	background-image: url(../images/delete.gif);
+ }
+ 
+ input.edit {
+ 	background-image: url(../images/edit.gif);
+ }
+ 
  .title {
  	font-style : italic;




From oleonard at users.sourceforge.net  Thu Jan 27 19:18:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:18:22 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-shelves.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CuEDm-0003cb-LV@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13906/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-shelves.tmpl 
Log Message:
Adding icons to submit buttons

Index: opac-shelves.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-shelves.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opac-shelves.tmpl	11 Jan 2005 22:49:54 -0000	1.1.2.1
--- opac-shelves.tmpl	27 Jan 2005 18:18:19 -0000	1.1.2.2
***************
*** 5,9 ****
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
--- 5,9 ----
  <div id="main">
  <!-- TMPL_IF Name="viewshelf" -->
! <form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="mainform">
      <table>
  	<caption>Contents of <em><!-- TMPL_VAR Name="shelfname" --></em></caption>
***************
*** 23,30 ****
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="cancel" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="cancel" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="submit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">
--- 23,30 ----
  					<td><!-- TMPL_VAR Name="barcode" --></td>
  		</tr><!-- /TMPL_LOOP --><!-- TMPL_ELSE -->
! 		<tr><td colspan="6">This shelf is empty.</td><!-- TMPL_UNLESS NAME="itemsloop" --><td><input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" /><input type="hidden" name="shelves" value="1" /><input type="submit" class="icon delete" value="Delete this Shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" /></td><!-- /TMPL_UNLESS --></tr>
  		<!-- /TMPL_IF -->
  	</table>
! 	<!-- TMPL_IF name="manageshelf" --><!-- TMPL_IF NAME="itemsloop" --><input type="submit" value="Remove Selected Items" class="icon delete" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" /><!-- /TMPL_IF --><!-- /TMPL_IF --></form><!-- TMPL_IF name="manageshelf" --> <form class="inline" method="get" action="/cgi-bin/koha/opac-shelves.pl"><input type="hidden" name="op" value="modif" /><input type="hidden" value="<!-- TMPL_VAR Name="shelfnumber" -->" name="shelf" /><input type="submit" value="Modify this Shelf" class="icon edit" /></form>
  <br /><br />
  <form action="/cgi-bin/koha/opac-shelves.pl" method="post">




From oleonard at users.sourceforge.net  Thu Jan 27 19:21:37 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:21:37 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.2.2.1
Message-ID: <E1CuEGv-0003oO-A9@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14633/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
      Tag: rel_2_2
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -r1.2 -r1.2.2.1
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:21:28 -0000	1.2.2.1
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 19:23:45 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:23:45 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en/includes navigation.inc,1.2,1.3
Message-ID: <E1CuEIz-0003vB-Ug@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15056/koha-tmpl/opac-tmpl/npl/en/includes

Modified Files:
	navigation.inc 
Log Message:
Adding virtual shelves and suggestions to persistent left-hand navigation menu

Index: navigation.inc
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** navigation.inc	29 Nov 2004 16:26:56 -0000	1.2
--- navigation.inc	27 Jan 2005 18:23:43 -0000	1.3
***************
*** 11,14 ****
--- 11,20 ----
  		<!-- Display for NPL <li><a href="http://66.213.78.70/upcoming.cfm">Upcoming Releases Waiting List</a></li> /Display for NPL -->
  	</ul>
+ 	<!-- TMPL_IF NAME="loggedinusername" -->
+ 	<ul>
+ 		<li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
+ 		<li><a href="/cgi-bin/koha/opac-suggestions.pl">Suggestions</a></li>
+ 	</ul>
+ 	<!-- /TMPL_IF -->
    </li>
   <!-- Display for NPL  <li><a href="http://www.athenscounty.lib.oh.us/programs.asp">programs</a></li>




From oleonard at users.sourceforge.net  Thu Jan 27 20:31:16 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:31:16 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.7
Message-ID: <E1CuFMK-0008Ks-Ra@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32023

Modified Files:
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:31:14 -0000	1.7
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }




From oleonard at users.sourceforge.net  Thu Jan 27 20:35:53 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:35:53 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.7,1.8
Message-ID: <E1CuFQn-0000Ck-C7@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv762/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** circulation.tmpl	12 Jan 2005 20:19:01 -0000	1.7
--- circulation.tmpl	27 Jan 2005 19:35:50 -0000	1.8
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 20:38:30 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:38:30 -0800
Subject: [Koha-cvs] CVS: koha renewscript.pl,1.6,1.6.2.1
Message-ID: <E1CuFTK-0000Ow-UK@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1485

Modified Files:
      Tag: rel_2_2
	renewscript.pl 
Log Message:
Adding option to pass parameter from circulation asking renewscript to redirect back to circulation instead of moremember.pl.  Since modification of the circulation templates allows a renew form on the circulation page, it's necessary to allow different redirects from different pages. renewscript.pl still defaults to redirecting to moremember.pl, so changes to templates are not required if not desired.

Index: renewscript.pl
===================================================================
RCS file: /cvsroot/koha/koha/renewscript.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** renewscript.pl	8 Nov 2004 20:00:00 -0000	1.6
--- renewscript.pl	27 Jan 2005 19:38:27 -0000	1.6.2.1
***************
*** 45,48 ****
--- 45,50 ----
  }
  my %env;
+ my $destination = $input->param("destination");
+ my $cardnumber = $input->param("cardnumber");
  my $bornum=$input->param("bornum");
  while ( my ($itemno, $value) = each %data) {
***************
*** 58,60 ****
  }
  
! print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
--- 60,66 ----
  }
  
! if($destination eq "circ"){
! 	print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
! } else {
! 	print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
! }
\ No newline at end of file




From oleonard at users.sourceforge.net  Thu Jan 27 20:41:24 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 11:41:24 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ circulation.tmpl,1.6.2.1,1.6.2.2
Message-ID: <E1CuFW8-0000dW-29@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2421/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	circulation.tmpl 
Log Message:
Adding hidden form fields to renew form so that renewscript.pl will redirect back to circulation.pl instead of moremember.pl

Index: circulation.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/circulation.tmpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -C2 -r1.6.2.1 -r1.6.2.2
*** circulation.tmpl	12 Jan 2005 20:18:09 -0000	1.6.2.1
--- circulation.tmpl	27 Jan 2005 19:41:21 -0000	1.6.2.2
***************
*** 261,265 ****
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>
--- 261,265 ----
  <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
  <!-- TMPL_IF NAME="borrowernumber" -->
! <div class="table"><form class="inline" action="/cgi-bin/koha/renewscript.pl" method="post"><input type="hidden" value="circ" name="destination" /><input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" /><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
  	<table>
  		<caption>Issues <!-- Display for NPL --><span class="print"><a href="/cgi-bin/koha/moremember-print.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Page)</a> <a href="/cgi-bin/koha/moremember-receipt.pl?bornum=<TMPL_VAR NAME="borrowernumber">">(Print Slip)</a></span><!-- /Display for NPL --></caption>




From oleonard at users.sourceforge.net  Thu Jan 27 19:19:01 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 10:19:01 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-main.tmpl,1.3.2.1,1.3.2.2
Message-ID: <E1CuEEP-0003fS-1d@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14052/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-main.tmpl 
Log Message:
Taking out unused class name

Index: opac-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** opac-main.tmpl	18 Jan 2005 17:35:55 -0000	1.3.2.1
--- opac-main.tmpl	27 Jan 2005 18:18:57 -0000	1.3.2.2
***************
*** 63,67 ****
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="opac-suggestions.pl" class="button">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>
--- 63,67 ----
  <p><a href="/cgi-bin/koha/opac-user.pl">your library home</a> |   
  	<a href="/cgi-bin/koha/opac-account.pl">your account</a> |
! 	<a href="/cgi-bin/koha/opac-userdetails.pl">your personal details</a>		<!-- TMPL_IF name="virtualshelves" -->| <a href="/cgi-bin/koha/opac-shelves.pl" class="button">virtual shelves</a><!-- /TMPL_IF --><!-- TMPL_IF name="suggestion" -->| <a href="/cgi-bin/koha/opac-suggestions.pl">view &amp; manage suggestions</a><!-- /TMPL_IF --></p>
  		<!-- TMPL_IF name="textmessaging"-->
  			<h2>Message from the library</h2>




From oleonard at users.sourceforge.net  Thu Jan 27 23:24:06 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:24:06 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.33
Message-ID: <E1CuI3a-0002Z3-0L@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9812/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:24:03 -0000	1.33
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,159 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
--- 164,168 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>




From oleonard at users.sourceforge.net  Thu Jan 27 23:25:38 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:25:38 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/members moremember.tmpl,1.32,1.32.2.1
Message-ID: <E1CuI54-0002er-Dw@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10190/koha-tmpl/intranet-tmpl/default/en/members

Modified Files:
      Tag: rel_2_2
	moremember.tmpl 
Log Message:
Adding display of member flags, if present (debarred, gonenoaddress, and lost)

Index: moremember.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -C2 -r1.32 -r1.32.2.1
*** moremember.tmpl	20 Sep 2004 13:41:47 -0000	1.32
--- moremember.tmpl	27 Jan 2005 22:25:36 -0000	1.32.2.1
***************
*** 3,7 ****
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div id="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
--- 3,7 ----
  <div id="mainbloc">
  	<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
! 	<div class="bloc25">
  		<h2 class="members">Membership record</h2>
  		<!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="othernames" --> <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_IF NAME="IS_ADULT" -->(<!-- TMPL_VAR NAME="firstname" -->, <!-- TMPL_VAR NAME="initials" -->)<!-- /TMPL_IF -->
***************
*** 94,99 ****
  		</form>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
--- 94,108 ----
  		</form>
  	</div>
+ 	
+ <!-- TMPL_IF NAME="flagged" -->	<div class="bloc25">
+ 		<h2 class="members">Member Flags</h2>
+ 		<ul>
+ 		<!-- TMPL_IF NAME="debarred" --><li>Member is debarred.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="gonenoaddress" --><li>Member's address is in doubt.</li><!-- /TMPL_IF -->
+ 		<!-- TMPL_IF NAME="lost" --><li>Member's card has been reported lost.</li><!-- /TMPL_IF -->
+ 		</ul>
+ 	</div><!-- /TMPL_IF -->
  
! 	<div class="bloc25">
  		<h2 class="members">Fines &amp; charges</h2>
  		<!-- TMPL_IF NAME="totaldue" -->
***************
*** 111,115 ****
  		</p>
  	</div>
! 	<div id="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
--- 120,124 ----
  		</p>
  	</div>
! 	<div class="bloc25">
  		<h2 class="members">Items requested</h2>
  			<!-- TMPL_IF NAME="reserveloop" -->
***************
*** 155,163 ****
  	</div>
  
! 	<div id="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div id="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->
--- 164,172 ----
  	</div>
  
! 	<div class="bloc25">
  		<a class="button" href="/cgi-bin/koha/readingrec.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Reading Record</a>
  	</div>
  
! 	<div class="bloc25">
  		<h2 class="members">Items currently on issue</h2>
  		<!-- TMPL_IF NAME="issueloop" -->




From oleonard at users.sourceforge.net  Thu Jan 27 23:32:22 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:32:22 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.5.2.1
Message-ID: <E1CuIBa-00034P-HD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11780/members

Modified Files:
      Tag: rel_2_2
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -r1.5 -r1.5.2.1
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:32:18 -0000	1.5.2.1
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Thu Jan 27 23:33:18 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Thu, 27 Jan 2005 14:33:18 -0800
Subject: [Koha-cvs] CVS: koha/members moremember.pl,1.5,1.6
Message-ID: <E1CuICU-00037P-Eo@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/members
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11975/members

Modified Files:
	moremember.pl 
Log Message:
Checking for the existence of flags (debarred, gonenoaddress. lost) and setting 'flagged' variable so the template knows whether or not to display the container for the error messages.

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/moremember.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** moremember.pl	26 Nov 2004 20:24:38 -0000	1.5
--- moremember.pl	27 Jan 2005 22:33:16 -0000	1.6
***************
*** 72,75 ****
--- 72,79 ----
  $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
  
+ if($data->{'debarred'} || $data->{'gonenoaddress'} || $data->{'lost'}){
+ 	$template->param(flagged =>1);
+ }
+ 
  $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
  




From oleonard at users.sourceforge.net  Fri Jan 28 20:34:17 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 11:34:17 -0800
Subject: [Koha-cvs] CVS: koha/opac opac-user.pl,1.14,1.14.2.1
Message-ID: <E1Cubsn-00019E-V6@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/opac
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4384/opac

Modified Files:
      Tag: rel_2_2
	opac-user.pl 
Log Message:
Comparing reserves' destination branch to the current holding branch to determine actual waiting status.  If destination branch is equal to holding branch, the item has been checked in at its destination and can be accurately shown as waiting.  If not, the item is still in transit and should not be shown as waiting.  Copying this fix from HEAD to rel_2_2. Helps fix Bug 670

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** opac-user.pl	4 May 2004 15:46:58 -0000	1.14
--- opac-user.pl	28 Jan 2005 19:34:15 -0000	1.14.2.1
***************
*** 124,128 ****
--- 124,133 ----
  foreach my $res (@$reserves) {
      if ($res->{'itemnumber'}) {
+ 	my $item = getiteminformation('',$res->{'itemnumber'},'');
+ 	$res->{'holdingbranch'} = $branches->{$item->{'holdingbranch'}}->{'branchname'};
  	$res->{'branch'} = $branches->{$res->{'branchcode'}}->{'branchname'};
+ 	if($res->{'holdingbranch'} eq $res->{'branch'}){
+ 			$res->{'atdestination'} = 1;
+ 		}
  	push @waiting, $res;
  	$wcount++;




From oleonard at users.sourceforge.net  Fri Jan 28 21:13:57 2005
From: oleonard at users.sourceforge.net (Owen Leonard)
Date: Fri, 28 Jan 2005 12:13:57 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/npl/en opac-user.tmpl,1.1.2.2,1.1.2.3
Message-ID: <E1CucVB-0003eg-Pf@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14030/koha-tmpl/opac-tmpl/npl/en

Modified Files:
      Tag: rel_2_2
	opac-user.tmpl 
Log Message:
Updated to show items as waiting only if destination branch matches holding branch.  Reserves table is also updated to show 'waiting' if item is at its destination branch, or 'in-transit' if item has been allocated but hasn't arrived yet.  Copied from HEAD.  Helps fix Bug 670

Index: opac-user.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** opac-user.tmpl	25 Jan 2005 21:29:01 -0000	1.1.2.2
--- opac-user.tmpl	28 Jan 2005 20:13:54 -0000	1.1.2.3
***************
*** 41,55 ****
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th>Title</th>
! 			<th>Author</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<tr>
  				<td>
! 					<b><a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></b></td><td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><b><!-- TMPL_VAR NAME="branch" --> <!-- TMPL_VAR NAME="holdingbranch" --></b>
! 				</td>
! 			</tr>
  		<!-- /TMPL_LOOP -->
  	</table>
--- 41,59 ----
  		<caption>Reserved Items Waiting</caption>
  		<tr>
! 			<th colspan="2">Title</th>
  			<th>Reserve date</th>
  			<th>Pick Up Branch</th>
  		</tr>
  		<!-- TMPL_LOOP NAME="WAITING" -->
! 			<!-- TMPL_IF NAME="atdestination" --><tr>
! 			<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  				<td>
! 					<a href="opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td><td><!-- TMPL_VAR NAME="reservedate" --></td><td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
! 				<!-- /TMPL_IF --></td>
! 			</tr><!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
  	</table>
***************
*** 69,75 ****
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
--- 73,79 ----
  <!-- TMPL_LOOP NAME="OVERDUES" -->
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
***************
*** 86,89 ****
--- 90,94 ----
  <th>Due</th>
  <!-- <th>Fines</th> -->
+ <!-- <th>Status</th> -->
  </tr>
  
***************
*** 91,99 ****
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> (<!-- TMPL_VAR NAME="itemtype" -->)</span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
  </tr>
  <!-- /TMPL_LOOP -->
--- 96,111 ----
  
  <tr>
! <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="date_due" --></td>
  <!-- <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td> -->
+ <!-- <td>
+ <!-- TMPL_IF NAME="status" -->
+ <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->" class="padded">Renew</a>
+ <!-- TMPL_ELSE -->
+ Not renewable
+ <!-- /TMPL_IF -->
+ </td> -->
  </tr>
  <!-- /TMPL_LOOP -->
***************
*** 113,132 ****
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th>Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --> <!-- TMPL_IF NAME="itemtype" -->(<!-- TMPL_VAR NAME="itemtype" -->)<!-- /TMPL_IF --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR NAME="branch" --></td>
! <!--  --></tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <!-- Display for NPL <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or  /Display for NPL -->go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->
--- 125,148 ----
  <!-- RESERVES TABLE ROWS -->
  <tr>
! <th colspan="2">Title</th>
  <th>Placed On</th>
  <th>Pick Up Location</th>
+ <th>Status</th>
  <!-- <th>Status</th> -->
  </tr>
  <!-- TMPL_LOOP NAME="RESERVES" -->
  <tr>
+ <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /></td>
  <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a><span class="item-details">
! <!-- TMPL_VAR NAME="author" --></span></td>
  <td><!-- TMPL_VAR NAME="reservedate" --></td>
! <td><!-- TMPL_VAR Name="branch" --></td>
! <td><!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE --><!-- TMPL_IF NAME="holdingbranch" -->In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
! </tr>
  <!-- /TMPL_LOOP -->
  </table></div>
  
! <p>If you no longer want a reserve, please <a href="mailto:nelpl at athenscounty.lib.oh.us">send us an e-mail</a>, or go to the circulation desk at your library to get it removed.</p>
  
  <!-- /TMPL_IF -->




From acli at users.sourceforge.net  Sun Jan 30 07:43:14 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 22:43:14 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po css_opac_zh_TW.po,1.4.2.4,1.4.2.5
Message-ID: <E1Cv8ni-0007xA-6X@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30535

Modified Files:
      Tag: rel_2_2
	css_opac_zh_TW.po 
Log Message:
Removed 1 fuzzy


Index: css_opac_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/css_opac_zh_TW.po,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -C2 -r1.4.2.4 -r1.4.2.5
*** css_opac_zh_TW.po	24 Jan 2005 07:57:29 -0000	1.4.2.4
--- css_opac_zh_TW.po	30 Jan 2005 06:43:11 -0000	1.4.2.5
***************
*** 18,27 ****
  "Content-Transfer-Encoding: 8bit\n"
  
- # TODO
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
- #, fuzzy
  msgid " Biblio(s) added"
! msgstr "??????????????????"
  
  #. %1$S: type=text name=value
--- 18,25 ----
  "Content-Transfer-Encoding: 8bit\n"
  
  #. SCRIPT
  #: ../../koha-tmpl/opac-tmpl/css/en/includes/opac-top.inc:29
  msgid " Biblio(s) added"
! msgstr "?????????????????????"
  
  #. %1$S: type=text name=value




From acli at users.sourceforge.net  Sun Jan 30 08:07:10 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sat, 29 Jan 2005 23:07:10 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.12,1.4.2.13
Message-ID: <E1Cv9As-0000Wt-D0@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1887

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Minor, partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -C2 -r1.4.2.12 -r1.4.2.13
*** default_intranet_zh_TW.po	27 Jan 2005 07:11:35 -0000	1.4.2.12
--- default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
***************
*** 2451,2455 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
--- 2451,2455 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:20
  msgid "Accept"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121b.tmpl:77
***************
*** 2461,2465 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
--- 2461,2465 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:8
  msgid "Accepted by"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/maninvoice.tmpl:12
***************
*** 2474,2484 ****
  msgstr "<a1>%s %s</a> ?????????"
  
! #  NOTE Stephen Hedges ?????????Accounts????????????????????? (Till Reconciliation)
! #  NOTE ?????????????????????????????????????????????
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
- #, fuzzy
  msgid "Accounting details"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
--- 2474,2482 ----
  msgstr "<a1>%s %s</a> ?????????"
  
! #  NOTE ???????????? by Arthur
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:48
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl:140
  msgid "Accounting details"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_126b.tmpl:134
***************
*** 2667,2673 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
- #, fuzzy
  msgid "Add a book by barcode"
! msgstr "??? %s ??????????????????"
  
  #. %1$s: TMPL_VAR name=shelfname
--- 2665,2670 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl:38
  msgid "Add a book by barcode"
! msgstr "???????????????????????????"
  
  #. %1$s: TMPL_VAR name=shelfname
***************
*** 3316,3322 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
- #, fuzzy
  msgid "Auth"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
--- 3313,3318 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:339
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/MARCdetail.tmpl:369
  msgid "Auth"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:113
***************
*** 3443,3452 ****
  msgstr ""
  
! #  XXX ????????????????????????
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, fuzzy, c-format
  msgid "Authority number %s"
! msgstr "????????????"
  
  #. For the first occurrence,
--- 3439,3448 ----
  msgstr ""
  
! # XXX
  #. %1$s: TMPL_VAR name=authid
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl:6
! #, c-format
  msgid "Authority number %s"
! msgstr "???????????????%s"
  
  #. For the first occurrence,
***************
*** 3454,3488 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, fuzzy, c-format
  msgid "Authority number : %s"
! msgstr "??????????????????%s"
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr ""
  
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr ""
  
- # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
- #, fuzzy
  msgid "Authority search"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
--- 3450,3486 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl:4
! #, c-format
  msgid "Authority number : %s"
! msgstr "???????????????%s"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number <!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "???????????????<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/receipt-search-result.tmpl:38
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number <!-- TMPL_VAR name=\"authid\" -->"
! msgstr "???????????????<!-- TMPL_VAR name=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:48
  msgid "Authority number<!-- TMPL_VAR NAME=\"authid\" -->"
! msgstr "???????????????<!-- TMPL_VAR NAME=\"authid\" -->"
  
+ # FIXME bug in tokenizer
  #. IMG
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:44
  msgid "Authority number<!-- TMPL_VAR name=\"authid\" -->"
! msgstr "???????????????<!-- TMPL_VAR name=\"authid\" -->"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl:4
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl:4
  msgid "Authority search"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl:3
***************
*** 3490,3503 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
- #, fuzzy
  msgid "Authority search results"
! msgstr "????????????????????????"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, fuzzy, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s ?????????????????????????????????"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
--- 3488,3500 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/searchresultlist.tmpl:3
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_210c.tmpl:3
  msgid "Authority search results"
! msgstr "??????????????????"
  
  #. %1$s: TMPL_VAR name=authtypetext
  #. %2$s: TMPL_VAR name=authtypecode
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl:92
! #, c-format
  msgid "Authority structure definition for %s (%s)"
! msgstr "%s (%s) ?????????????????????"
  
  # NOTE http://dimes.lins.fju.edu.tw/pub/fju-lins-29/cmark3-dc.htm
***************
*** 4150,4173 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
- #, fuzzy
  msgid "Barcode Search"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
- #, fuzzy
  msgid "Barcode:"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
--- 4147,4168 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:35
  msgid "Barcode Search"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:93
  msgid "Barcode generator"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/catalogue/catalogue-home.tmpl:37
  msgid "Barcode:"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:44
  msgid "Barcodes Generator"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/intranet-main.tmpl:128
  msgid "Barcodes generator"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:323
***************
*** 4581,4587 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
- #, fuzzy
  msgid "Book seller"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
--- 4576,4581 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/order.tmpl:8
  msgid "Book seller"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:50
***************
*** 5240,5246 ****
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
- #, fuzzy
  msgid "Category Code and Description"
! msgstr "????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
--- 5234,5239 ----
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/categorie.tmpl:6
  msgid "Category Code and Description"
! msgstr "?????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl:230
***************
*** 5615,5619 ****
  #. INPUT type=reset name=B2
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:174
- #, fuzzy
  msgid "Clear Fields"
  msgstr "????????????"
--- 5608,5611 ----
***************
*** 10025,10034 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
- #, fuzzy
  msgid "Items requested"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
--- 10017,10025 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:162
  msgid "Items currently on issue"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:114
  msgid "Items requested"
! msgstr "???????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl:171
***************
*** 10065,10069 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
--- 10056,10060 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_117.tmpl:630
  msgid "Ivoire"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:108
***************
*** 17081,17085 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6
--- 17072,17076 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/suggestion/acceptorreject.tmpl:10
  msgid "Suggested by"
! msgstr "?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl:6




From acli at users.sourceforge.net  Mon Jan 31 02:52:39 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:39 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.2
Message-ID: <E1CvQk3-0006Zs-Ix@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25267

Modified Files:
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:36 -0000	1.2
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:53:09 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:53:09 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1.2.1,1.1.2.2
Message-ID: <E1CvQkX-0006ba-QU@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25376

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:53:07 -0000	1.1.2.2
***************
*** 92,96 ****
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 92,96 ----
  			<!-- TMPL_IF name="f3d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 99,103 ****
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 99,103 ----
  			<!-- TMPL_IF name="f3e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 02:52:54 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 17:52:54 -0800
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/value_builder unimarc_field_121a.tmpl,1.1,1.1.2.1
Message-ID: <E1CvQkI-0006aV-Tz@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25309

Modified Files:
      Tag: rel_2_2
	unimarc_field_121a.tmpl 
Log Message:
Spelling correction


Index: unimarc_field_121a.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** unimarc_field_121a.tmpl	7 Jun 2004 09:54:41 -0000	1.1
--- unimarc_field_121a.tmpl	31 Jan 2005 01:52:52 -0000	1.1.2.1
***************
*** 53,57 ****
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				techique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

--- 53,57 ----
  			<!-- TMPL_IF name="f2d" -->

  				<option value="d" SELECTED>Par

! 				technique de teledetection active</option>

  			<!-- TMPL_ELSE -->

  				<option value="d">Par technique de

***************
*** 60,64 ****
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				techique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de

--- 60,64 ----
  			<!-- TMPL_IF name="f2e" -->

  				<option value="e" SELECTED>Par

! 				technique de teledetection passive</option>

  			<!-- TMPL_ELSE -->

  				<option value="e">Par technique de





From acli at users.sourceforge.net  Mon Jan 31 03:44:02 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 18:44:02 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.13,1.4.2.14
Message-ID: <E1CvRXm-0000n9-5z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2974

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -C2 -r1.4.2.13 -r1.4.2.14
*** default_intranet_zh_TW.po	30 Jan 2005 07:06:40 -0000	1.4.2.13
--- default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
***************
*** 227,230 ****
--- 227,231 ----
  msgstr "%S ???"
  
+ # XXX
  #. %1$p: type=radio name=label value=<!-- TMPL_VAR NAME="tagname" -->
  #. %2$s: TMPL_VAR name=labelname
***************
*** 232,236 ****
  #, c-format
  msgid "%p Label %s"
[...964 lines suppressed...]
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
--- 18480,18484 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:25
  msgid "Tri-dimensionnel"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_110.tmpl:143
***************
*** 20556,20560 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21
--- 20563,20567 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_121a.tmpl:83
  msgid "photographique"
! msgstr "???????????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bull/statecollection.tmpl:21




From acli at users.sourceforge.net  Mon Jan 31 07:02:50 2005
From: acli at users.sourceforge.net (Ambrose C. LI)
Date: Sun, 30 Jan 2005 22:02:50 -0800
Subject: [Koha-cvs] CVS: koha/misc/translator/po default_intranet_zh_TW.po,1.4.2.14,1.4.2.15
Message-ID: <E1CvUeA-0001u4-91@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/koha/koha/misc/translator/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7245

Modified Files:
      Tag: rel_2_2
	default_intranet_zh_TW.po 
Log Message:
Partial update


Index: default_intranet_zh_TW.po
===================================================================
RCS file: /cvsroot/koha/koha/misc/translator/po/default_intranet_zh_TW.po,v
retrieving revision 1.4.2.14
retrieving revision 1.4.2.15
diff -C2 -r1.4.2.14 -r1.4.2.15
*** default_intranet_zh_TW.po	31 Jan 2005 02:43:56 -0000	1.4.2.14
--- default_intranet_zh_TW.po	31 Jan 2005 06:02:44 -0000	1.4.2.15
***************
*** 610,614 ****
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s ??????????????? <a1>??????</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
--- 610,614 ----
  #, c-format
  msgid "%s suggestions waiting <a1>Manage</a>"
! msgstr "%s ????????????????????????<a1>??????</a>"
  
  #. %1$s: TMPL_VAR name=renewalsallowed
***************
*** 9810,9816 ****
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, fuzzy, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "????????? <b>%s</b> ????????? %s (<a1>%s</a>) ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
--- 9810,9816 ----
  #. %5$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:15
! #, c-format
  msgid "Item %s (%s) is marked waiting at <b>%s</b> for %s (<a1>%s</a>)."
! msgstr "???????????????%1$s???(%2$s) ??????????????????????????????????????? %4$s (<a1>%5$s</a>) ??? <b>%3$s</b> ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl:43
***************
*** 9925,9929 ****
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
--- 9925,9929 ----
  "Item type : select here an item type. If none is selected, the search is "
  "done on every item type"
! msgstr "???????????????????????????????????????????????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/itemtypes.tmpl:128
***************
*** 9939,9943 ****
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
--- 9939,9943 ----
  "Item types are useful for many things, and <b>very</b> important in "
  "controlling how Koha works :"
! msgstr "????????????????????????????????????????????? Koha ????????????<b>??????</b>????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:2
***************
*** 10338,10342 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "??????Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
--- 10338,10342 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/auth.tmpl:36
  msgid "Koha Login"
! msgstr "?????? Koha"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/authorised_values.tmpl:3
***************
*** 10394,10398 ****
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
--- 10394,10398 ----
  "Koha internal (you should have no reasons to modify the following default "
  "values)"
! msgstr "Koha ?????????????????????????????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:14
***************
*** 10410,10414 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
--- 10410,10414 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:30
  msgid "Koha link:"
! msgstr "Koha ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/about.tmpl:8
***************
*** 10456,10468 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
--- 10456,10469 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:26
  msgid "Label heigth (Expressed in mm)"
! msgstr "????????????????????? / ?????????"
  
+ # XXX
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:156
  msgid "Label number to start printing"
! msgstr "???????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:23
  msgid "Label width (Expressed in mm)"
! msgstr "????????????????????? / ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_120.tmpl:674
***************
*** 10682,10686 ****
  #, c-format
  msgid "Link:%s,"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
--- 10683,10687 ----
  #, c-format
  msgid "Link:%s,"
! msgstr "?????????%s???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl:48
***************
*** 10924,10927 ****
--- 10925,10929 ----
  "results screens."
  msgstr ""
+ "??????????????? Koha ?????????????????????????????????????????????&mdash;&mdash;???????????????????????????????????????????????????????????????????????????????????????"
  
  #. %1$s: TMPL_VAR name=tagfield
***************
*** 11060,11068 ****
  msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
- #, fuzzy
  msgid "Managed in tab"
! msgstr "?????????-1?????? (????????????)"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
--- 11062,11071 ----
  msgstr ""
  
+ # FIXME bug in tokenizer
  #: ../../koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl:40
  msgid "Managed in tab"
! msgstr "?????????????????????"
  
+ # FIXME grammatical mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marc_subfields_structure.tmpl:17
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/marctagstructure.tmpl:17
***************
*** 11202,11210 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
--- 11205,11213 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:41
  msgid "Margin Bottom (Expressed in mm)"
! msgstr "??????????????????????????? / ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:44
  msgid "Margin Left (Expressed in mm)"
! msgstr "??????????????????????????? / ?????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_128b.tmpl:148
***************
*** 12390,12394 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
--- 12393,12397 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl:34
  msgid "No suggestions waiting"
! msgstr "??????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl:21
***************
*** 15677,15683 ****
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, fuzzy, c-format
  msgid "Reserved by %s"
! msgstr "????????????%s"
  
  # XXX
--- 15680,15686 ----
  #. %1$s: TMPL_VAR name=RESERVED
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/circulation.tmpl:190
! #, c-format
  msgid "Reserved by %s"
! msgstr "?????????????????? %s ??????"
  
  # XXX
***************
*** 15685,15691 ****
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, fuzzy, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "%s ????????? (<a1>%s</a>)???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
--- 15688,15694 ----
  #. %2$s: TMPL_VAR name=borcnum
  #: ../../koha-tmpl/intranet-tmpl/default/en/circ/branchtransfers.tmpl:22
! #, c-format
  msgid "Reserved: reserve found for %s (<a1>%s</a>)."
! msgstr "?????????????????????????????? %s (<a1>%s</a>) ?????? ???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/user/userpage.tmpl:13
***************
*** 15914,15920 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
- #, fuzzy
  msgid "Sample"
! msgstr "???"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
--- 15917,15922 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-add.tmpl:19
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/bull/subscription-detail.tmpl:20
  msgid "Sample"
! msgstr "??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/value_builder/unimarc_field_116.tmpl:348
***************
*** 16005,16013 ****
  msgstr "??????"
  
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
- #, fuzzy
  msgid "Save Code"
! msgstr "??????"
  
  #. INPUT type=submit
--- 16007,16015 ----
  msgstr "??????"
  
+ #  NOTE???Code??????????????????Country Code???
  #. INPUT type=submit name=submit
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/barcodes.tmpl:28
  msgid "Save Code"
! msgstr "????????????"
  
  #. INPUT type=submit
***************
*** 16484,16496 ****
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
--- 16486,16499 ----
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:12
  msgid "Set the page type."
! msgstr "?????????????????????"
  
+ # FIXME spelling mistake in original
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:10
  msgid "Set width and heigth of the label that you are going to work with."
! msgstr "?????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/barcodes/printerConfig.tmpl:11
  msgid "Set your system dpi by default."
! msgstr "??????????????? DPI ??????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/help/admin/itemtypes.tmpl:18
***************
*** 16498,16502 ****
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr ""
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67
--- 16501,16505 ----
  "Setting up item types is one of the first things you should do after "
  "installing the Koha software."
! msgstr "???????????????????????????????????? Koha ?????????????????????????????????????????????"
  
  #: ../../koha-tmpl/intranet-tmpl/default/en/members/newjmember.tmpl:67