From rch at liblime.com Sun Mar 4 20:53:32 2007 From: rch at liblime.com (Ryan Higgins) Date: Sun, 04 Mar 2007 19:53:32 +0000 Subject: [Koha-cvs] koha/opac opac-detail.pl [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Ryan Higgins 07/03/04 19:53:32 Modified files: opac : opac-detail.pl Log message: BUGFIX - reserve button not shown because check against authorized value of notforloan CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-detail.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.13&r2=1.32.2.14 Patches: Index: opac-detail.pl =================================================================== RCS file: /sources/koha/koha/opac/opac-detail.pl,v retrieving revision 1.32.2.13 retrieving revision 1.32.2.14 diff -u -b -r1.32.2.13 -r1.32.2.14 --- opac-detail.pl 10 Jan 2007 10:52:58 -0000 1.32.2.13 +++ opac-detail.pl 4 Mar 2007 19:53:32 -0000 1.32.2.14 @@ -17,7 +17,7 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA -# $Id: opac-detail.pl,v 1.32.2.13 2007/01/10 10:52:58 toins Exp $ +# $Id: opac-detail.pl,v 1.32.2.14 2007/03/04 19:53:32 rych Exp $ use strict; require Exporter; @@ -68,6 +68,7 @@ $dat->{'count'} = @items; #adding RequestOnOpac filter to allow or not the display of plce reserve button +# FIXME - use me or delete me. my $RequestOnOpac; if (C4::Context->preference("RequestOnOpac")) { $RequestOnOpac = 1; @@ -78,13 +79,12 @@ $norequests = 0 unless ( ( $itm->{'wthdrawn'} ) || ( $itm->{'itemlost'} ) - || ( $itm->{'notforloan'} ) || ( $itm->{'itemnotforloan'} ) || ( !$itm->{'itemnumber'} ) ); $itm->{ $itm->{'publictype'} } = 1; } -$template->param( norequests => $norequests ); +$template->param( norequests => $norequests, ); ## get notes and subjects from MARC record my $dbh = C4::Context->dbh; From jmf at liblime.com Sun Mar 4 21:57:27 2007 From: jmf at liblime.com (Joshua Ferraro) Date: Sun, 04 Mar 2007 20:57:27 +0000 Subject: [Koha-cvs] koha installer/InstallAuth.pm koha-tmpl/intrane... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Joshua Ferraro 07/03/04 20:57:27 Modified files: installer : InstallAuth.pm koha-tmpl/intranet-tmpl/prog/en/installer: step1.tmpl step2.tmpl step3.tmpl Added files: koha-tmpl/intranet-tmpl/prog/en/images: koha.org-logo.gif koha-tmpl/intranet-tmpl/prog/en/includes: installer-doc-head-close.inc koha-tmpl/intranet-tmpl/prog/en/installer: auth.tmpl Log message: Improvements to English language strings in Web Installer Improvements to semantics of HTML in Web Installer Added Web Installer-specific styles, including koha.org logo CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/installer/InstallAuth.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.1&r2=1.1.2.2 http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl?cvsroot=koha&only_with_tag=rel_3_0&rev=1.1.2.1 Patches: Index: installer/InstallAuth.pm =================================================================== RCS file: /sources/koha/koha/installer/Attic/InstallAuth.pm,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -b -r1.1.2.1 -r1.1.2.2 --- installer/InstallAuth.pm 9 Feb 2007 21:04:17 -0000 1.1.2.1 +++ installer/InstallAuth.pm 4 Mar 2007 20:57:27 -0000 1.1.2.2 @@ -32,7 +32,7 @@ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); # set the version for version checking -$VERSION = do { my @v = '$Revision: 1.1.2.1 $' =~ /\d+/g; +$VERSION = do { my @v = '$Revision: 1.1.2.2 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); }; @@ -231,7 +231,7 @@ my $template_name; - $template_name = "auth.tmpl"; + $template_name = "installer/auth.tmpl"; # state variables my $loggedin = 0; Index: koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step1.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -b -r1.1.2.1 -r1.1.2.2 --- koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl 9 Feb 2007 21:10:49 -0000 1.1.2.1 +++ koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl 4 Mar 2007 20:57:27 -0000 1.1.2.2 @@ -1,20 +1,12 @@ - - - - - - Koha Installer - - - - - -

Welcome to Koha Installer

- +Koha › Web Installer › Step 1 + +

Koha › Web Installer › Step 1

You are about to install Koha.

-
-

Pick up your language :
+ + +

Please pick up your language from the following list. If your langauge is not +listed, please inform your systems administrator.

-

And click Next to continue

+

Click Next to continue

@@ -35,7 +27,7 @@
  • -
    This module is used whenever Koha has to send a mail. +
    This module is used whenever Koha has to send email.
    This module is needed if you intend to print barcodes. @@ -44,11 +36,11 @@
    This module is needed if you intend to print spine labels. -
    This module is needed if you intend to use LDAP connexions. +
    This module is needed if you intend to use LDAP for authentication.
  • - Please consider installing them using these commands before getting further. + Please consider installing these modules before continuing.
       
         perl -MCPAN -e "install ";
    @@ -56,38 +48,38 @@
       
    -

    Some problems occured.
    +

    I encountered some problems.

    +
      -

      Your perl version seems to be obsolete.
      - Consider upgrading

      +
    • Your perl version seems to be obsolete. + Please upgrade to a newer version of Perl (at least Version 5.006001).
    • -

      Your perl installation is not in /usr/bin/.
      - You may have problems.

      +
    • Your perl installation is not in /usr/bin/. + This version of the Web Installer expects perl to be in /usr/bin/.
    • -

      Zebra server doesnot seem to be installed.
      - Please consider installing it before getting further.

      +
    • Zebra server doesn't seem to be installed or I can't find it. + Please install it before continuing.
    • -

      Mysql server doesnot seem to be installed.
      - Please consider installing it before getting further.

      +
    • MySQL server doesn't seem to be installed or I can't find it. + Please install it before continuing.
    • -

      YAZ doesnot seem to be installed.
      - It is required for research.
      - Please consider installing it before getting further.

      +
    • Yaz doesn't seem to be installed or I can't find it. + Please install it before continuing.
    • +
    -

    All Modules and third-party softwares installed OK +

    All dependencies installed.

    -

    Click next to continue

    +

    Please click next to continue

    - - + Index: koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step2.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -b -r1.1.2.1 -r1.1.2.2 --- koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl 9 Feb 2007 21:10:49 -0000 1.1.2.1 +++ koha-tmpl/intranet-tmpl/prog/en/installer/step2.tmpl 4 Mar 2007 20:57:27 -0000 1.1.2.2 @@ -1,71 +1,52 @@ - - - - - - Koha Installer - - - - - -

    Welcome to Koha Installer

    - -

    Mysql connection information

    -

    -database name : -

    -

    -database host : -

    -

    -database port : -

    -

    -database user : -

    -
    -
    - -
    - -

    Can Connect OK

    - -

    database created OK

    - -

    user has all required privileges on database OK

    +Koha › Web Installer › Step 2 + +

    Koha › Web Installer › Step 2

    +

    Database settings:

    +
      +
    • database name :
    • +
    • database host :
    • +
    • database port : (probably OK if blank)
    • +
    • database user :
    • +
    +
    + + + +

    Connection established.

    + +

    Database exists.

    + +

    User has all required privileges on database .

    -

    user doesnot have enough privilege on database

    -

    Ask for or make a change in user privileges
    see this page and ask for usage insert update delete drop and create access for user on

    +

    user doesn't have enough privilege on database

    +

    Ask for or make a change in the user's privileges. Need help? See this page. User must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on

    -

    No database detected on system

    -

    Ask for or create Database in mysql database management system

    +

    No database named detected.

    +

    Please create the database before continuing.

    -
    : +
    :
    -
    Problem can come out from various reasons : -
    • Check mysql server is up and running.
    • -
    • Check data entered in koha.xml
    • -
    • Check hostname in koha.xml.
      Some Linux mysql servers donot use localhost but ip adress :127.0.0.1
    • +
      +
        +
      • Check that your database is running.
      • +
      • Check your database settings in koha.xml.
      • +
      • Check the hostname setting in koha.xml. + Some database servers require 127.0.0.1 rather than localhost.
      +

      Please correct these errors and start the installer again. +

      Click Next to continue

      + -
      + -

      Click Next to continue if information are valid

      +

      Please click Next to continue if this information is correct

    Index: koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/Attic/step3.tmpl,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -b -r1.1.2.1 -r1.1.2.2 --- koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl 9 Feb 2007 21:10:49 -0000 1.1.2.1 +++ koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl 4 Mar 2007 20:57:27 -0000 1.1.2.2 @@ -1,12 +1,7 @@ - - - - - - Koha Installer - - - +Koha › Web Installer › Step 3 + +

    Koha › Web Installer › Step 3

    + - -

    Welcome to Koha Installer

    -

    Select Dataset

    -
    +

    Selecting Frameworks

    + -

    Select Language first :

    +

    Please select a framework language you want to import:

    - " style="color: grey; font-size: 80%; cursor: se-resize;" onclick="Hide('')"> - + " style="color: grey; cursor: se-resize;" onclick="Hide('')">+ +

    -

    " style="display:none" class="bloc25"> +
    " style="display:none">

    @@ -122,6 +108,9 @@

    +

    Hint: You can select specific frameworks from each framework set by clicking on the + to expand.

    +

    When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, + please be patient

    @@ -141,7 +130,8 @@

    Installation complete.
    -

    Click on Finish to close the process, change access lists so that these operations are unreachable, and get to Koha Interface. +

    Click on Finish to complete and load the Koha Staff Interface. + The installer will be disabled for security reasons.

    @@ -150,18 +140,24 @@

    -

    Import the database structure ?

    -Import -
    +

    Now we're ready to create the database tables and fill them with some default data.

    +Click here to continue. + -

    Update

    -

    Database structure OK

    -updateSkip to datasets Import -
    +

    Success

    +
      +
    • Database tables created
    • +
    + +You can now update your database +structure to the latest version if you are upgrading from a previous version of Koha. +

    +

    Otherwise, select frameworks to import to continue the installation.

    + -

    Updating Mysql database

    +

    Updating Mysql database

    Update report :

    Index: koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif =================================================================== RCS file: koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif diff -N koha-tmpl/intranet-tmpl/prog/en/images/koha.org-logo.gif Binary files /dev/null and /tmp/cvsmtA39o differ Index: koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc =================================================================== RCS file: koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc diff -N koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc 4 Mar 2007 20:57:27 -0000 1.1.2.1 @@ -0,0 +1,65 @@ + + + + + + + +

    Koha

    Index: koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl =================================================================== RCS file: koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl diff -N koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl 4 Mar 2007 20:57:27 -0000 1.1.2.1 @@ -0,0 +1,48 @@ + + Koha › Error: Access Denied + Koha › Error: Session Timed Out -- + Koha › Error: IP Address Change -- + Koha › Error Invalid Username or Password -- + Koha › Welcome to the Koha Web Installer + + +

    Login Error

    +

    Sorry, Koha doesn't think you have permission for this page.

    + + + + +

    Login Error

    Sorry, your session has timed out. Please login again.

    + + + + +

    Login Error

    You are accessing Koha from a different IP address! Please login again.

    + + + + +

    Login Error

    You entered an incorrect username or password. Please try again.

    + + + + +" method="post" name="mainform" id="mainform"> + + " value="" /> + +

    Welcome to the Koha Web Installer

    +

    Before we begin, please verify you have the correct credentials to continue. Please log in +with the username and password given to you by your systems administrator and located in your +koha.xml.

    + + + + +
    Please enter your username and password
    +

    + + + + + From jmf at liblime.com Sun Mar 4 22:35:11 2007 From: jmf at liblime.com (Joshua Ferraro) Date: Sun, 04 Mar 2007 21:35:11 +0000 Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes d... [rel_3_0] Message-ID: CVSROOT: /sources/koha Module name: koha Branch: rel_3_0 Changes by: Joshua Ferraro 07/03/04 21:35:11 Modified files: koha-tmpl/intranet-tmpl/prog/en/includes: doc-head-close.inc Log message: end tag for "link" omitted CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2.2.2&r2=1.2.2.3 Patches: Index: doc-head-close.inc =================================================================== RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -b -r1.2.2.2 -r1.2.2.3 --- doc-head-close.inc 24 Jan 2007 13:55:01 -0000 1.2.2.2 +++ doc-head-close.inc 4 Mar 2007 21:35:11 -0000 1.2.2.3 @@ -1,7 +1,7 @@ -/includes/intranet-print.css"> +/includes/intranet-print.css" />