Document Actions
Koha IMAR patch
Koha IMAR patch (agaist Koha 2.2.5)
Size 71.5 kB - File type text/x-patch
Click here to get the file
File contents
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/backcpy.sh cdkoha/koha-2.2.5.nit.imar/backcpy.sh
--- koha-2.2.5/backcpy.sh 1970-01-01 02:00:00.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/backcpy.sh 2006-04-09 13:12:08.000000000 +0300
@@ -0,0 +1,7 @@
+cp -r /usr/local/koha/intranet/htdocs/* intranet-html/
+cp -r /usr/local/koha/intranet/cgi-bin/* intranet-cgi/
+cp -r /usr/local/koha/intranet/scripts/* scripts/
+cp -r /usr/local/koha/intranet/modules/* modules/
+cp -r /usr/local/koha/opac/htdocs/* opac-html/
+cp -r /usr/local/koha/opac/cgi-bin/* opac-cgi/
+rm -rf $(find . -name *~ -o -name CVS)
\ No newline at end of file
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/installer.pl cdkoha/koha-2.2.5.nit.imar/installer.pl
--- koha-2.2.5/installer.pl 2004-11-16 15:04:18.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/installer.pl 2006-04-09 12:12:32.000000000 +0300
@@ -119,9 +119,9 @@
databasesetup($auto_install);
-updatedatabase($auto_install);
-
-populatedatabase($auto_install);
+# len 20060410, the database is populated at previous step
+# updatedatabase($auto_install);
+# populatedatabase($auto_install);
restoremycnf();
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/Install.pm cdkoha/koha-2.2.5.nit.imar/Install.pm
--- koha-2.2.5/Install.pm 2005-06-03 16:27:25.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/Install.pm 2007-02-03 17:29:53.000000000 +0200
@@ -97,7 +97,7 @@
=item heading
$messages->{'WelcomeToKohaInstaller'
- = heading('Welcome to the Koha Installer') . qq|...|;
+ = heading('Welcome to the Nemesis IT customized Koha Installer') . qq|...|;
The heading function takes one string, the text to be displayed as
the heading, and returns a formatted heading (currently formatted
@@ -126,7 +126,7 @@
my $messages;
$messages->{'continuing'}->{en}="Great! Continuing...\n\n";
$messages->{'WelcomeToKohaInstaller'}->{en} =
- heading('Welcome to the Koha Installer') . qq|
+ heading('Welcome to the Nemesis IT customized 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
@@ -202,6 +202,30 @@
Press the <ENTER> key to continue: |; #'
+#len nit 20060418
+$messages->{'BusinessISBNMissing'}->{en}=qq|
+
+The Business::ISBN module is missing. This module is necessary if you
+want to use Nemesis IT integration with AMS category codes;
+To install this module you can use the command:
+
+perl -MCPAN -e 'install Business::ISBN'
+
+...or by installing packages for your distribution, if available.
+Press the <ENTER> key to continue: |; #'
+
+$messages->{'NetHTTPMissing'}->{en}=qq|
+
+The Net::HTTP module is missing. This module is necessary if you
+want to use Nemesis IT integration with AMS category codes;
+To install this module you can use the command:
+
+perl -MCPAN -e 'install Net::HTTP'
+
+...or by installing packages for your distribution, if available.
+Press the <ENTER> key to continue: |; #'
+
+
$messages->{'CheckingPerlModules'}->{en} = heading('PERL MODULES') . qq|
Checking perl modules ...
|;
@@ -226,8 +250,7 @@
$messages->{'KohaAlreadyInstalled'}->{en} =
heading('Koha already installed') . qq|
It looks like Koha is already installed on your system (%s/koha.conf exists).
-If you would like to upgrade your system to %s, please use
-the koha.upgrade script in this directory.
+This script cannot upgrade your system to %s, please remove the existing installation and try again.
%s
@@ -881,7 +904,19 @@
push @missing, "Net::Z3950";
}
}
+ unless (eval {require Business::ISBN}){
+ showmessage(getmessage('BusinessISBNMissing'), 'PressEnter', '', 1);
+ if ($#missing>=0) { # see above note
+ push @missing, "Business::ISBN";
+ }
+ }
+ unless (eval {require Net::HTTP}){
+ showmessage(getmessage('NetHTTPMissing'), 'PressEnter', '', 1);
+ if ($#missing>=0) { # see above note
+ push @missing, "Net::HTTP";
+ }
+ }
#
# Print out a list of any missing modules
#
@@ -1114,7 +1149,7 @@
sub getdatabaseinfo {
my ($auto_install) = @_;
- $database = 'Koha';
+ $database = 'koha';
$hostname = 'localhost';
$user = 'kohaadmin';
$pass = '';
@@ -1365,7 +1400,7 @@
sub getapachevhostinfo {
my ($auto_install) = @_;
- $svr_admin = "webmaster\@$domainname";
+ $svr_admin = "webmaster\@";
$servername=`hostname`;
chomp $servername;
$opacport=80;
@@ -1688,6 +1723,30 @@
}
system("chmod -R a+rx $opacdir $intranetdir");
+ # nit len 20060420, create koha.daily
+ system("rm -rf $etcdir/koha.daily");
+ system("mkdir $etcdir/koha.daily");
+ system("mkdir -p $intranetdir/backup");
+ open(CBCK,">$etcdir/koha.daily/save_my.sh") or warn "Couldn't create file at $etcdir/koha.daily. Must have write capability.\n";
+ print CBCK qq|
+#!/bin/bash
+
+DB=$database
+USER=$user
+HOST=$hostname
+PASSWD=$pass
+BACKUP_DIR=$intranetdir/backup
+
+
+DATE=\$(date +%d_%b_%Y_%H_%M)
+
+BACKUP_FILE=\$BACKUP_DIR/koha.mysql.\$DATE
+mysqldump -h \$HOST -u \$USER --password=\$PASSWD \$DB > \$BACKUP_FILE
+gzip \$BACKUP_FILE
+ |;
+ close(CBCK);
+ system("chmod u+x $etcdir/koha.daily/save_my.sh");
+
# Create /etc/koha.conf
my $old_umask = umask(027); # make sure koha.conf is never world-readable
@@ -1810,7 +1869,7 @@
# 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/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, lock_tables_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y', 'Y')\" mysql");
system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
# Change to admin user login
setmysqlclipass($pass);
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/acqui.simple/addbiblio.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/acqui.simple/addbiblio.pl
--- koha-2.2.5/intranet-cgi/acqui.simple/addbiblio.pl 2005-12-14 17:01:36.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/acqui.simple/addbiblio.pl 2007-03-21 21:32:45.000000000 +0200
@@ -527,4 +527,4 @@
itemtype => $frameworkcode, # HINT: if the library has itemtype = framework, itemtype is auto filled !
hide_marc => C4::Context->preference('hide_marc'),
);
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
+output_html_with_http_headers $input, $cookie, $template->output;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/barcodes/barcodes.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/barcodes/barcodes.pl
--- koha-2.2.5/intranet-cgi/barcodes/barcodes.pl 2005-09-01 22:31:06.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/barcodes/barcodes.pl 2006-08-24 22:17:33.000000000 +0300
@@ -123,7 +123,7 @@
type => "intranet",
query => $input,
authnotrequired => 0,
- flagsrequired => {parameters => 1},
+ flagsrequired => {editcatalogue => 1},
debug => 1,
});
@@ -140,4 +140,4 @@
$template->param(ERROR => 0);
}
# Shows the template with the real values replaced
-output_html_with_http_headers $input, $cookie, $template->output;
\ No newline at end of file
+output_html_with_http_headers $input, $cookie, $template->output;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/renewscript.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/renewscript.pl
--- koha-2.2.5/intranet-cgi/renewscript.pl 2005-01-27 21:38:27.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/renewscript.pl 2007-03-21 20:49:10.000000000 +0200
@@ -63,4 +63,4 @@
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
+}
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/acquisitions_stats.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/acquisitions_stats.pl
--- koha-2.2.5/intranet-cgi/reports/acquisitions_stats.pl 2005-12-20 12:11:16.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/acquisitions_stats.pl 2007-03-21 20:41:38.000000000 +0200
@@ -516,4 +516,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/bor_issues_top.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/bor_issues_top.pl
--- koha-2.2.5/intranet-cgi/reports/bor_issues_top.pl 2005-12-20 12:11:16.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/bor_issues_top.pl 2007-03-21 20:41:52.000000000 +0200
@@ -409,4 +409,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/borrowers_out.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_out.pl
--- koha-2.2.5/intranet-cgi/reports/borrowers_out.pl 2005-12-20 12:11:16.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_out.pl 2007-03-21 20:42:03.000000000 +0200
@@ -332,4 +332,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/borrowers_stats.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_stats.pl
--- koha-2.2.5/intranet-cgi/reports/borrowers_stats.pl 2005-09-27 19:19:37.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_stats.pl 2007-03-21 20:42:10.000000000 +0200
@@ -408,4 +408,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/borrowers_stats.plugin cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_stats.plugin
--- koha-2.2.5/intranet-cgi/reports/borrowers_stats.plugin 2005-04-07 15:18:43.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/borrowers_stats.plugin 2007-03-21 20:42:16.000000000 +0200
@@ -180,4 +180,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/catalogue_out.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/catalogue_out.pl
--- koha-2.2.5/intranet-cgi/reports/catalogue_out.pl 2005-12-20 12:11:16.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/catalogue_out.pl 2007-03-21 20:42:28.000000000 +0200
@@ -346,4 +346,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/catalogue_stats.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/catalogue_stats.pl
--- koha-2.2.5/intranet-cgi/reports/catalogue_stats.pl 2005-08-02 18:53:40.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/catalogue_stats.pl 2007-03-21 20:42:35.000000000 +0200
@@ -632,4 +632,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/cat_issues_top.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/cat_issues_top.pl
--- koha-2.2.5/intranet-cgi/reports/cat_issues_top.pl 2005-12-20 12:11:16.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/cat_issues_top.pl 2007-03-21 20:42:22.000000000 +0200
@@ -420,4 +420,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/issues_avg_stats.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_avg_stats.pl
--- koha-2.2.5/intranet-cgi/reports/issues_avg_stats.pl 2005-04-07 15:06:05.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_avg_stats.pl 2007-03-21 20:42:41.000000000 +0200
@@ -589,4 +589,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/issues_by_borrower_category.plugin cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_by_borrower_category.plugin
--- koha-2.2.5/intranet-cgi/reports/issues_by_borrower_category.plugin 2005-12-01 16:00:27.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_by_borrower_category.plugin 2007-03-21 20:42:47.000000000 +0200
@@ -228,4 +228,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/issues_stats.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_stats.pl
--- koha-2.2.5/intranet-cgi/reports/issues_stats.pl 2005-12-01 16:01:17.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/issues_stats.pl 2007-03-21 20:42:55.000000000 +0200
@@ -535,4 +535,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/itemtypes.plugin cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/itemtypes.plugin
--- koha-2.2.5/intranet-cgi/reports/itemtypes.plugin 2005-04-06 22:49:05.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/itemtypes.plugin 2007-03-21 20:43:02.000000000 +0200
@@ -96,4 +96,4 @@
return \@mainloop;
}
-1;
\ No newline at end of file
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports/reports-home.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/reports-home.pl
--- koha-2.2.5/intranet-cgi/reports/reports-home.pl 2005-03-18 12:00:54.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports/reports-home.pl 2006-08-24 22:17:34.000000000 +0300
@@ -14,7 +14,7 @@
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {catalogue => 1},
+ flagsrequired => {editcatalogue => 1},
debug => 1,
});
output_html_with_http_headers $query, $cookie, $template->output;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/reports-home.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports-home.pl
--- koha-2.2.5/intranet-cgi/reports-home.pl 2004-02-12 11:16:18.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/reports-home.pl 2006-08-24 22:17:34.000000000 +0300
@@ -14,7 +14,7 @@
query => $query,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {catalogue => 1},
+ flagsrequired => {editcatalogue => 1},
debug => 1,
});
output_html_with_http_headers $query, $cookie, $template->output;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-cgi/value_builder/usmarc_field_ams.pl cdkoha/koha-2.2.5.nit.imar/intranet-cgi/value_builder/usmarc_field_ams.pl
--- koha-2.2.5/intranet-cgi/value_builder/usmarc_field_ams.pl 1970-01-01 02:00:00.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-cgi/value_builder/usmarc_field_ams.pl 2007-03-21 20:19:51.000000000 +0200
@@ -0,0 +1,121 @@
+#!/usr/bin/perl
+
+use strict;
+use C4::Auth;
+use CGI;
+use C4::Context;
+use HTML::Template;
+use C4::Search;
+use C4::Output;
+
+=head1
+
+plugin_parameters : other parameters added when the plugin is called by the dopop function
+
+=cut
+sub plugin_parameters {
+ my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
+ return "";
+}
+
+
+sub plugin_javascript {
+ my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
+ my $function_name= "ams".(int(rand(100000))+1);
+ my $res="
+<br/>
+<script>
+function Focus$function_name(subfield_managed) {
+return 1;
+}
+
+function Blur$function_name(subfield_managed) {
+return 1;
+}
+
+function Clic$function_name(fi) {
+ var isbn = \"\";
+ for (i=0 ; i<document.forms['f'].field_value.length ; i++) {
+ if (document.forms['f'].kohafield[i].value == \"biblioitems.isbn\"){
+ if(document.forms['f'].field_value[i].value.length>0) {
+ isbn = document.forms['f'].field_value[i].value;
+ }
+ }
+ }
+ if(isbn.length > 0){
+ //document.f.field_value[i].value = 'test';
+ newin=window.open(\"../plugin_launcher.pl?plugin_name=usmarc_field_ams.pl&index=\"+fi+\"&isbn=\"+isbn,\"field_ams\",'width=500,height=400,toolbar=false,scrollbars=yes');
+ }else{
+ alert(\"Please fill the ISBN field first\");
+ }
+}
+</script>
+";
+ return ($function_name,$res);
+}
+
+sub plugin {
+ my ($input) = @_;
+ my %env;
+ my $index= $input->param('index');
+ my $isbn = $input->param('isbn');
+
+ if ($isbn =~ /([0-9X]{10,13})/i){
+ $isbn = $1;
+ }else{
+ print "ISBN:".$isbn." does not match format\n";
+ }
+
+ my ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "value_builder/usmarc_field_ams.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {editcatalogue => 1},
+ debug => 1,
+ });
+ if(eval {require Business::ISBN}){
+ require Business::ISBN;
+ my $isbn_object = Business::ISBN->new($isbn);
+ if($isbn_object->is_valid() == Business::ISBN::GOOD_ISBN()){
+ $isbn = $isbn_object->as_string;
+ }
+ }
+ my $amsCodes = getAMSCodes($isbn);
+ $template->param(index=> $index, isbn => $isbn, amsCodes => $amsCodes);
+ print $input->header(-cookie => $cookie),$template->output;
+}
+
+sub getAMSCodes{
+ my $amsServer = "www.ams.org";
+ if(eval {require Net::HTTP}){
+ require Net::HTTP;
+ my ($isbn)=@_;
+
+ #my $query = "/msnmain?preferred_language=en&pg3=ALLF&s3=".$isbn."&l=20&reference_lists=show&simple_headlines=full&contributed_items=show&redirect=Providence%2C+RI+USA&Submit=Start+Search&fn=130&form=basicsearch";
+ my $query = "/mathscinet/search/publdoc.html?arg3=&co4=AND&co5=AND&co6=AND&co7=AND&dr=all&pg4=AUCN&pg5=TI&pg6=PC&pg7=ALLF&pg8=ET&r=1&s4=&s5=&s6=&s7=".$isbn."&s8=All&yearRangeFirst=&yearRangeSecond=&yrop=eq";
+
+ my $s = Net::HTTP->new(Host => $amsServer) || die $@;
+ $s->write_request(GET => $query, 'User-Agent' => "Mozilla/5.0");
+ my($code, $mess, %h) = $s->read_response_headers;
+
+ my $buf;
+ while (1) {
+ my $tbuf;
+ my $n = $s->read_entity_body($tbuf, 1024);
+ die "read failed: $!" unless defined $n;
+ last unless $n;
+ $buf = $buf.$tbuf;
+ }
+ #TODO: check for no results
+
+ #if($buf =~ /<a href=\".*\/msnmain\?fn=705[^>]+>([^<]+)<\/a><\/div>/i) {
+ if($buf =~ /<a href="\/mathscinet\/search\/mscdoc.html\?code=[^>]+>([^<]+)<\/a>/){
+ print $isbn." AMS codes found ".$1;
+ return $1;
+ }
+ }
+ return "";
+}
+
+1;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui/newbiblio.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui/newbiblio.tmpl 2006-01-05 17:08:27.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui/newbiblio.tmpl 2006-08-24 22:17:29.000000000 +0300
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="main-top-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<script language="javascript" type="text/javascript">
<!--
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio-nomarc.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio-nomarc.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio-nomarc.tmpl 2004-11-08 23:22:05.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio-nomarc.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Add a Non-MARC Record<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl 2005-09-14 21:41:31.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -5,7 +5,7 @@
document.write("<\/div>");
</script><!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
@@ -89,7 +89,7 @@
<!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="marc_lib" -->
<!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
- </label>
+ </label><br/>
<!-- TMPL_VAR NAME="marc_value" -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->" />
<input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1" />
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem-nomarc.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem-nomarc.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem-nomarc.tmpl 2004-11-08 23:22:05.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem-nomarc.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Add a items for <!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<!-- TMPL_IF NAME="NOBARCODE" -->
<div class="error">You must give the item a barcode</div>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem.tmpl 2005-09-14 21:51:58.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/additem.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: Items for Bibliographic Record <!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl 2005-02-03 19:43:00.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/acqui.simple/marcimport.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,6 +1,6 @@
<!-- 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" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<form method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->" enctype="multipart/form-data">
<table border="0" cellpadding="0" cellspacing="0" align="center" class="results" width="80%">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/bull/subscription-add.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/bull/subscription-add.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/bull/subscription-add.tmpl 2005-01-10 19:05:03.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/bull/subscription-add.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,7 +1,7 @@
<!-- 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" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
<!-- TMPL_IF name="mod" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/export/marc.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/export/marc.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/export/marc.tmpl 2006-01-05 17:08:27.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/export/marc.tmpl 2006-08-24 22:17:30.000000000 +0300
@@ -1,6 +1,6 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Cataloging: MARC Export<!-- TMPL_INCLUDE NAME="doc-head-close-addbiblio.inc" -->
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav-brief.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main"><h1>MARC Export</h1>
<div class="data">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/includes/acqui-topmenu.inc cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/includes/acqui-topmenu.inc
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/includes/acqui-topmenu.inc 2005-01-10 19:08:36.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/includes/acqui-topmenu.inc 2006-08-24 22:17:32.000000000 +0300
@@ -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> | <a href="/cgi-bin/koha/bull-home.pl">Serials</a></div>
\ No newline at end of file
+<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
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/includes/intranet-nav.inc cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/includes/intranet-nav.inc
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/includes/intranet-nav.inc 2005-07-05 21:38:49.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/includes/intranet-nav.inc 2006-08-24 22:17:32.000000000 +0300
@@ -3,29 +3,41 @@
<li><h4>Koha</h4></li>
<li><a href="/cgi-bin/koha/mainpage.pl">Koha intranet home</a></li>
- <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a> <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
+ <!-- TMPL_IF NAME="CAN_user_circulate" --><li><a href="/cgi-bin/koha/circ/circulation.pl">Circulatie</a><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Imprumut</a> <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
<label for="navfindborrower">Iss<span class="accesskey">u</span>e to:</label>
<input id="navfindborrower" name="findborrower" type="text" size="10" accesskey="u" />
<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
<input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
<input type="submit" class="submit" value="Submit" />
- </form></li><li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>eturns</a>
-</li><!-- Display for NPL <li><a href="/reserve_list.php">Reserve List</a></li><li><a href="http://66.213.78.70/secret/reserves/index.cfm">New Title Waiting List</a></li> /Display for NPL --><!-- Hide from NPL --><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li><!-- /Hide from NPL --></ul></li>
- <li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a><ul><li><form action="/cgi-bin/koha/members/member.pl" method="post">
+ </form></li><li><a accesskey="r" href="/cgi-bin/koha/circ/returns.pl"><span class="accesskey">R</span>etur</a>
+</li><!-- Display for NPL <li><a href="/reserve_list.php">Reserve List</a></li><li><a href="http://66.213.78.70/secret/reserves/index.cfm">New Title Waiting List</a></li> /Display for NPL --><!-- Hide from NPL --><!-- TMPL_IF NAME="nit_transfers" --><li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li><!-- /TMPL_IF --><!-- /Hide from NPL --></ul></li><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="CAN_user_borrowers" --><li><a href="/cgi-bin/koha/members/members-home.pl">Membrii</a><ul><li><form action="/cgi-bin/koha/members/member.pl" method="post">
<label for="navmember">Search:</label><input id="navmember" type="text" size="10" name="member" />
<input type="submit" value="Search" class="submit" />
- </form></li></ul></li>
- <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Catalog</a><ul><li><form 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="3" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><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="navkeyword" name="value" size="10" accesskey="q" /><input type="submit" value="Start search" class="submit" /></form></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li><li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
-</ul></li>
-<li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Add MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li>
-<li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li>
-<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li><!-- /Hide from NPL --></ul></li>
-<!-- Hide from NPL --><li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
+ </form></li></ul></li><!-- /TMPL_IF -->
+ <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Catalog</a><ul><li><form 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="3" /><label for="navkeyword"><span class="accesskey">Q</span>uick Search:</label><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="navkeyword" name="value" size="10" accesskey="q" /><input type="submit" value="Start search" class="submit" /></form></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li><li><a href="http://live.moreforohio.org:8080/vdx/">MORE Search</a></li> /Display for NPL -->
+</ul></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="CAN_user_editcatalogue" --><li><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Catalogare</a><ul><!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Add Temp</a> </li> /Display for NPL --><li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Adauga MARC</a></li><!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Achizitii</a></li>
+<!-- TMPL_IF NAME="nit_serials" --><li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li><!-- /TMPL_IF -->
+<li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Rafturi</a></li>
+<li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Coduri de bare</a></li>
+<!-- /Hide from NPL --></ul></li><!-- /TMPL_IF -->
+<!-- Hide from NPL -->
+<!-- TMPL_IF NAME="CAN_user_tools" -->
+<li><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports</a></li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="CAN_user_parameters" -->
<li><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a>
<ul><li><a href="/cgi-bin/koha/admin-home.pl">System Administration</a></li>
-<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul>
-</li><li><a href="/cgi-bin/koha/about.pl">About Koha</a></li><!-- /Hide from NPL -->
+<li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li>
+</ul>
+</li>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="nit_about" -->
+<li><a href="/cgi-bin/koha/about.pl">About Koha</a></li>
+<!-- /TMPL_IF -->
+<!-- /Hide from NPL -->
<!-- TMPL_IF NAME="loggedinusername" --><li>
Logged in as: <!-- TMPL_VAR NAME="loggedinusername" --> <ul><li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li></ul></li><!-- /TMPL_IF -->
<!-- Display for NPL <li><h4>Public Web Site</h4></li>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/intranet-main.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/intranet-main.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/intranet-main.tmpl 2005-02-07 21:17:44.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/intranet-main.tmpl 2006-08-24 22:17:29.000000000 +0300
@@ -2,41 +2,7 @@
<!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
<div id="main">
- <div id="menu"><dl>
- <dt><a href="/cgi-bin/koha/circ/circulation.pl">
- Circulation</a></dt>
- <dd><ul><li><a href="/cgi-bin/koha/circ/circulation.pl">Issues</a></li> <li><a href="/cgi-bin/koha/circ/returns.pl">Returns</a></li> <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set Branch</a></li></ul></dd>
-<dt><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></dt>
- <dd>Start with a search to add, update, or delete a record, check accounts, & renew items.
- <form action="/cgi-bin/koha/members/member.pl" method="post">
- <label for="member">Enter Name or Barcode</label><input id="member" type="text" size="25" name="member" />
- <input type="submit" value="Search" class="submit" />
- </form></dd>
- <dt><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Catalog Search</a></dt>
- <dd>Search bibilographic records
-<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="3" /><label for="keyword">Quick Search: </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" id="keyword" name="value" size="25" /><input type="submit" value="Start search" class="submit"></form>
- <ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&marc=1&type=intranet">Advanced Search</a></li><!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL --><li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a></li></ul>
- </dd></dl></div>
- <div id="submenu">
-<dl>
-<dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
- <dd><ul>
-<!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Enter Brief Record (Temp Cards)</a> </li> /Display for NPL -->
-<li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a></li> <!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> <li><a href="/cgi-bin/koha/bull-home.pl">Serials</a></li> <!-- /Hide from NPL --></ul></dd></dl>
-
-<dl>
-<!-- Hide from NPL -->
-<dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
- </a></dt>
- <dd>Till reconciliation, overdues, and inventory</dd>
-<!-- /Hide from NPL -->
-</dl>
-<dl>
-<!-- Hide from NPL --><dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
-<dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li> <li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li> <li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li> <li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a></li></ul></dd> <!-- /Hide from NPL -->
-</dl>
-<br clear="both" /></div>
-
-</div>
+ <div id="firstpage">"Simion Stoilow" Institute of Mathematics of the Romanian Academy
+ </div>
+ </div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/parameters/z3950servers.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/parameters/z3950servers.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/parameters/z3950servers.tmpl 2005-04-21 00:29:05.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/parameters/z3950servers.tmpl 2006-08-24 22:17:33.000000000 +0300
@@ -225,7 +225,7 @@
</form>
<div id="results"> <!-- TMPL_IF NAME="searchfield" -->
You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
- <!-- /TMPL_IF --></div>
+ <!-- /TMPL_IF -->
<table>
<tr>
<th>Site</th>
@@ -253,6 +253,7 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
+</div>
<div class="tabitem">
<!-- TMPL_IF NAME="offsetgtzero" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/search.marc/search.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/search.marc/search.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/search.marc/search.tmpl 2005-09-28 22:57:12.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/search.marc/search.tmpl 2006-08-24 22:17:33.000000000 +0300
@@ -195,7 +195,7 @@
}
function Dopop(link,i) {
- var searchstring=document.forms[4].value[i].value;
+ var searchstring=document.forms['f'].value[i].value;
newin=window.open(link+'&search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
}
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/value_builder/usmarc_field_ams.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/value_builder/usmarc_field_ams.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/value_builder/usmarc_field_ams.tmpl 1970-01-01 02:00:00.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/value_builder/usmarc_field_ams.tmpl 2006-08-24 22:17:33.000000000 +0300
@@ -0,0 +1,24 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->AMS category type search<!-- TMPL_VAR name="biblionumber" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<div id="main-compact">
+ <h1>AMS category search for ISBN<!-- TMPL_VAR name="isbn" --></h1>
+<form name="f_pop">
+<p>
+ <label class="labelsubfield"> ISBN:</label><input type="text" size="30" name="isbn" value="<!-- TMPL_VAR name="isbn" -->"/>
+<input type="submit" value="Search again" class="submit"/></br>
+</p>
+ <p>
+ <label class="labelsubfield">Result:</label><input type="text" size="30" name="f1" value="<!-- TMPL_VAR name="amsCodes" -->"/>
+<input type="button" value="Fill and close" onclick="javascript:putBack();" class="submit"/>
+<input type="hidden" name="plugin_name" value="usmarc_field_ams.pl"/>
+<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->"/>
+</p>
+</form>
+<script language="JavaScript" type="text/javascript">
+ function putBack() {
+ opener.document.f.field_value[<!-- TMPL_VAR name="index" -->].value= document.f_pop.f1.value;
+ self.close();
+ return false;
+ }
+</script>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/intranet-html/intranet-tmpl/npl/en/z3950/searchresult.tmpl cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/z3950/searchresult.tmpl
--- koha-2.2.5/intranet-html/intranet-tmpl/npl/en/z3950/searchresult.tmpl 2005-04-26 01:03:46.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/intranet-html/intranet-tmpl/npl/en/z3950/searchresult.tmpl 2006-08-24 22:17:33.000000000 +0300
@@ -3,7 +3,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Z39.50 Search Results</title>
+<!-- TMPL_IF NAME="refresh" -->
<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
+<!-- /TMPL_IF -->
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" type="image/x-icon" />
<style type="text/css">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/modules/C4/Search.pm cdkoha/koha-2.2.5.nit.imar/modules/C4/Search.pm
--- koha-2.2.5/modules/C4/Search.pm 2005-12-14 17:58:42.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/modules/C4/Search.pm 2007-03-21 21:23:56.000000000 +0200
@@ -1364,6 +1364,14 @@
my ($lib) = $sthnflstatus->fetchrow;
$data->{notforloantext} = $lib;
}
+
+ #len, show shelfs
+ my $shows=$dbh->prepare("select itemnumber, shelfname from shelfcontents s, bookshelf b where s.shelfnumber = b.shelfnumber and s.itemnumber =
+ ?");
+ $shows->execute($data->{'itemnumber'});
+ if (my $shelfdata=$shows->fetchrow_hashref){
+ $data->{'nit_bookshelf'} = $shelfdata->{'shelfname'};
+ }
$results[$i]=$data;
$i++;
}
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/includes/opac-top.inc cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/includes/opac-top.inc
--- koha-2.2.5/opac-html/opac-tmpl/css/en/includes/opac-top.inc 2005-09-23 12:58:23.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/includes/opac-top.inc 2006-08-24 22:17:40.000000000 +0300
@@ -29,14 +29,15 @@
</script>
</head>
<body>
+<!-- customized by Nemesis IT www.nemesisit.ro -->
<!-- MENUS -->
<div id="title">
- <!-- TMPL_IF name="opacsmallimage" -->
- <img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="65" alt="koha logo"/>
- <!-- TMPL_ELSE -->
- <img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="koha logo"/>
- <!-- /TMPL_IF -->
- <div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
+ <div class="SmallLibraryName">
+ <h1> </h1>
+ <div id="div">
+ <!--TMPL_VAR name="LibraryName"--></div>
+ <h1>Library Catalog Search</h1>
+ </div>
</div>
<div id="menuline">
<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Home</a>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-auth.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-auth.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-auth.tmpl 2005-06-17 15:31:44.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-auth.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<div id="mainbloc">
- <div id="bloc60">
<!-- TMPL_IF NAME="nopermission" -->
+ <div class="bloc60">
<!-- This is what is displayed if user doesnt have permission -->
<h2>Sorry, KOHA doesnt think you have permission for this page.<h2>
<!-- /TMPL_IF -->
@@ -19,9 +19,9 @@
<!-- TMPL_IF NAME="invalid_username_or_password" -->
<!-- This is what is displayed if user doesnt have permission -->
<h2>You entered an incorrect username or password, please try again.<h2>
- <!-- /TMPL_IF -->
</div>
- <div id="bloc60">
+ <!-- /TMPL_IF -->
+ <div class="bloc60">
<!-- TMPL_IF NAME="loginprompt" -->
<!-- login prompt time-->
<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-detail.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-detail.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-detail.tmpl 2005-12-01 15:50:50.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-detail.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -11,9 +11,11 @@
<a href="opac-ISBDdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button catalogue">
ISBD
</a>
+ <!-- TMPL_IF name="virtualshelves" -->
<a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
Add to shelf
</a>
+ <!-- /TMPL_IF -->
<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
Print
</a>
@@ -118,6 +120,7 @@
<th>date Due</th>
<th>last Seen</th>
<th>barcode</th>
+ <th>bookshelf</th>
</tr>
<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
<tr>
@@ -141,6 +144,11 @@
<td><!-- TMPL_VAR NAME="datedue" --></td>
<td><!-- TMPL_VAR NAME="datelastseen" --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
+ <td>
+ <!-- TMPL_IF name="nit_bookshelf" -->
+ <!-- TMPL_VAR NAME="nit_bookshelf" -->
+ <!-- /TMPL_IF -->
+ </td>
</tr>
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-ISBDdetail.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-ISBDdetail.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-ISBDdetail.tmpl 2005-12-02 19:08:37.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-ISBDdetail.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -10,9 +10,15 @@
<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>
+
+
+ <!-- TMPL_IF name="virtualshelves" -->
+ <a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!
+-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+ Add to shelf
+ </a>
+ <!-- /TMPL_IF -->
+
<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
Print
</a>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-main.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-main.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-main.tmpl 2005-12-30 12:16:21.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-main.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -13,16 +13,20 @@
</head>
<body>
-<div id="leftbloc">
- <!-- TMPL_IF name="opaclargeimage" -->
- <img class="relative" src="<!-- TMPL_VAR name="opaclargeimage"-->" title="koha" alt="koha" />
- <!-- TMPL_ELSE -->
- <img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="koha" alt="koha" />
- <!-- /TMPL_IF -->
+<div id="title">
+ <div class="SmallLibraryName">
+ <h1> </h1>
+ <div id="div">
+ <TMPL_VAR name="LibraryName">
+ </div>
+ <!-- MENUS -->
+ <h1>Library Catalog Search</h1>
+ </div>
+ <h1> </h1>
+ <!-- -->
</div>
-
-<div id="homebloc">
- <h1 class="LibraryName"><TMPL_VAR name="LibraryName"></h1>
+<div id="mainbloc">
+<div class="homebloc">
<h2>Search the catalogue</h2>
<form action="/cgi-bin/koha/opac-search.pl">
<p>
@@ -38,7 +42,8 @@
<a href="/cgi-bin/koha/opac-search.pl" class="button">Advanced Search, More Options </a>
</p>
</form>
-
+</div>
+<div class="homebloc">
<h2>Recent acquisitions</h2>
<form action="/cgi-bin/koha/opac-search.pl">
<p>
@@ -56,6 +61,8 @@
<input type="submit" value="OK" class="button" />
</p>
</form>
+</div>
+<div class="homebloc">
<h2>Other options</h2>
<!-- TMPL_IF NAME="loggedinusername" -->
<p>
@@ -91,11 +98,9 @@
<input type="submit" value="Change Language" class="button" />
</p>
</form>
+</div>
<p class="copyright">
This Library is powered by <a href="http://www.koha.org">Koha</a> free software ILS, and compliant with web standards
- <a href="http://validator.w3.org/check/referer">
- <img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="16" width="44" />
- </a>
</p>
</div>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-MARCdetail.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-MARCdetail.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-MARCdetail.tmpl 2006-01-05 18:06:44.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-MARCdetail.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -9,9 +9,15 @@
<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>
+
+
+ <!-- TMPL_IF name="virtualshelves" -->
+ <a href="javascript:Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!
+-- TMPL_VAR NAME="biblionumber" -->')" class="button catalogue">
+ Add to shelf
+ </a>
+ <!-- /TMPL_IF -->
+
<a href="javascript:Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber" -->')" class="button catalogue">
Print
</a>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-searchresults.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-searchresults.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-searchresults.tmpl 2005-12-01 15:57:49.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-searchresults.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -36,6 +36,7 @@
</p>
</div>
<!-- Search Results Table -->
+<div class="bloc60">
<!-- TMPL_IF NAME="total" -->
<form action="opac-searchresults.pl" method="get" name="myform">
<input type="submit" class="button" value="Add Checked Items to Biblio Basket" onclick="addMultiple(); return false;"> <input type="reset" value="Clear All" class="button">
@@ -122,6 +123,7 @@
</tr>
</table>
</form>
+</div>
<p class="center">
Results <b><i><!-- TMPL_VAR NAME="from" --></i> through <i><!-- TMPL_VAR NAME="to" --></i> of <i><!-- TMPL_VAR NAME="total" --></i></b>
</p>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-search.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-search.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-search.tmpl 2005-09-28 18:48:25.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-search.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -5,7 +5,7 @@
<form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
- <div id="bloc60">
+ <div class="bloc60">
<h2 class="catalogue">Search on</h2>
<p>
<input type="hidden" name="op" value="do_search" />
@@ -43,7 +43,7 @@
<!-- /TMPL_UNLESS -->
</p>
<p>
- <label class="label20">Subject</label>
+ <label class="label20">AMS classification</label>
<input type="hidden" name="marclist" value="bibliosubject.subject" />
<input type="hidden" name="and_or" value="and" />
<input type="hidden" name="excluding" value="" />
@@ -80,7 +80,7 @@
<!-- TMPL_VAR name="CGIbranch" -->
</p>
</div>
- <div id="bloc20">
+ <div class="bloc60">
<h2>Other options</h2>
<p>
<label class="label20">Item barcode</label>
@@ -160,7 +160,7 @@
<input type="submit" value="Start search" class="button catalogue" />
<input type="reset" value="Clear all" class="button catalogue" />
</p>
- <div id="bloc60">
+ <div class="bloc60">
<h2>Hints</h2>
<h3>Title</h3>
<p>You can enter a complete or a part of a title. The search will also be done in subtitles and other title related fields</p>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-serial-issues.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-serial-issues.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-serial-issues.tmpl 2005-06-16 18:44:31.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-serial-issues.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -6,7 +6,7 @@
<a class="button" href="opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->&selectview=full">Complete view</a>
<!-- TMPL_LOOP name="subscription_LOOP" -->
- <div id="bloc60">
+ <div class="bloc60">
<h2 class="catalogue">Subscription information for <!-- TMPL_VAR name="bibliotitle" --></h2>
<p>It began on <b><!-- TMPL_VAR name="histstartdate" --></b> and is issued every
<b>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-shelves.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-shelves.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-shelves.tmpl 2005-08-24 20:49:59.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-shelves.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,5 +1,6 @@
<!-- TMPL_INCLUDE Name="opac-top.inc" -->
<div id="mainbloc">
+<!-- TMPL_IF name="virtualshelves" -->
<!-- TMPL_IF Name="viewshelf" -->
<form action="/cgi-bin/koha/opac-shelves.pl" method="get">
<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
@@ -76,7 +77,7 @@
</p>
</form>
</div>
- <div id="bloc60">
+ <div class="bloc60">
<form action="/cgi-bin/koha/opac-shelves.pl" method="post">
<input type="hidden" name="shelves" value="1">
<h2>Add Shelf</h2>
@@ -185,5 +186,6 @@
</form>
</div>
<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-suggestions.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-suggestions.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-suggestions.tmpl 2005-08-24 20:49:59.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-suggestions.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,5 +1,6 @@
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<div id="mainbloc">
+<div class="bloc60">
<!-- TMPL_IF name="op_add" -->
<h1>Enter a new suggestion</h1>
<p>Fill this form to suggest the library a new acquisition. You will be mailed when the library treats you suggestion</p>
@@ -153,4 +154,5 @@
<p>Note : if you ask suggestion done by anybody, the result will contain only new suggestions. Suggestions treated by a librarian will not be shown.</p>
<!-- /TMPL_IF -->
</div>
+</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-user.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-user.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-user.tmpl 2005-12-05 11:45:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-user.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<div id="mainbloc">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
- <div class="bloc20">
+ <div class="bloc60">
<h2>Are our records correct?</h2>
<p>Library Card: <!-- TMPL_VAR NAME="cardnumber" --> </p>
<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/en/opac-userupdate.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-userupdate.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/en/opac-userupdate.tmpl 2005-06-06 17:13:59.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/en/opac-userupdate.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,6 +1,7 @@
<!-- TMPL_INCLUDE name="opac-top.inc" -->
<div id="mainbloc">
+<div class="bloc60">
<h2>Member information change</h2>
<p><i>Please change what's needed. An email will be sent to the library.<br />
Your changes won't appear until the library has validated them.</i></p>
@@ -19,5 +20,6 @@
<p><input type="submit" value="Submit" class="button" /></p>
</form>
</div>
+</div>
<!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/includes/opac-top.inc cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/includes/opac-top.inc
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/includes/opac-top.inc 2006-01-05 18:55:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/includes/opac-top.inc 2006-08-24 22:17:40.000000000 +0300
@@ -31,12 +31,12 @@
<body>
<!-- MENUS -->
<div id="title">
- <!-- TMPL_IF name="opacsmallimage" -->
- <img src="<!-- TMPL_VAR name="opacsmallimage"-->" height="65" alt="Logo Koha">
- <!-- TMPL_ELSE -->
- <img src="<!-- TMPL_VAR name="themelang" -->/images/front-background-small.gif" height="50" alt="Logo Koha">
- <!-- /TMPL_IF -->
- <div class="SmallLibraryName"><!--TMPL_VAR name="LibraryName"--></div>
+ <div class="SmallLibraryName">
+ <h1> </h1>
+ <div id="div">
+ <!--TMPL_VAR name="LibraryName"--></div>
+ <h1>Library Catalog Search</h1>
+ </div>
</div>
<div id="menuline">
<a class="menu" href="/cgi-bin/koha/opac-main.pl" title="Koha home page">Accueil</a> <a class="menu" href="/cgi-bin/koha/opac-search.pl" title="Advanced search">Recherche avancée</a>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-auth.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-auth.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-auth.tmpl 2006-01-05 18:55:04.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-auth.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -2,6 +2,7 @@
<div id="mainbloc">
<div id="bloc60">
<!-- TMPL_IF NAME="nopermission" -->
+ <div class="bloc60">
<!-- This is what is displayed if user doesnt have permission -->
<h2>Désolé, Koha pense que vous ne pouvez pas accéder à cette page.<h2>
<!-- /TMPL_IF -->
@@ -19,9 +20,9 @@
<!-- TMPL_IF NAME="invalid_username_or_password" -->
<!-- This is what is displayed if user doesnt have permission -->
<h2> Vous avez saisi un nom de membre ou mot de passe invalide, merci de réessayer.<h2>
+ </div>
<!-- /TMPL_IF -->
- </div>
- <div id="bloc60">
+ <div class="bloc60">
<!-- TMPL_IF NAME="loginprompt" -->
<!-- login prompt time-->
<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-detail.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-detail.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-detail.tmpl 2006-01-05 18:55:04.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-detail.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -104,6 +104,7 @@
<th>Date de retour</th>
<th>Vu pour la dernière fois</th>
<th>code à barres</th>
+ <th>etagere</th>
</tr>
<!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
<tr>
@@ -127,6 +128,11 @@
<td><!-- TMPL_VAR NAME="datedue" --></td>
<td><!-- TMPL_VAR NAME="datelastseen" --></td>
<td><!-- TMPL_VAR NAME="barcode" --></td>
+ <td>
+ <!-- TMPL_IF name="nit_bookshelf" -->
+ <!-- TMPL_VAR NAME="nit_bookshelf" -->
+ <!-- /TMPL_IF -->
+ </td>
</tr>
<!-- /TMPL_LOOP -->
<!-- TMPL_LOOP NAME="WEB_RESULTS" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-main.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-main.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-main.tmpl 2006-01-05 18:55:05.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-main.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -13,17 +13,22 @@
</head>
<body>
-<div id="leftbloc">
- <!-- TMPL_IF name="opaclargeimage" -->
- <img class="relative" src="<!-- TMPL_VAR name="opaclargeimage"-->" title="Koha" alt="Koha">
- <!-- TMPL_ELSE -->
- <img class="relative" src="<!-- TMPL_VAR NAME='themelang' -->/images/front-background-med.gif" title="Koha" alt="Koha">
- <!-- /TMPL_IF -->
+<div id="title">
+ <div class="SmallLibraryName">
+ <h1> </h1>
+ <div id="div">
+ <TMPL_VAR name="LibraryName">
</div>
-<div id="homebloc">
- <h1 class="LibraryName"><TMPL_VAR name="LibraryName"></h1>
- <h2>Chercher</h2>
+ <!-- MENUS -->
+ <h1>Library Catalog Search</h1>
+ </div>
+ <h1> </h1>
+ <!-- -->
+</div>
+<div id="mainbloc">
+<div class="homebloc">
+ <h2>Search the catalogue</h2>
<form action="/cgi-bin/koha/opac-search.pl">
<p>
<input type="hidden" name="op" value="do_search" />
@@ -38,7 +43,8 @@
<a href="/cgi-bin/koha/opac-search.pl" class="button">Recherche Avancée, Plus d'Options </a>
</p>
</form>
-
+</div>
+<div class="homebloc">
<h2>Acquisitions récentes</h2>
<form action="/cgi-bin/koha/opac-search.pl">
<p>
@@ -54,6 +60,8 @@
<input type="submit" value="OK" class="button" />
</p>
</form>
+</div>
+<div class="homebloc">
<h2>Autres options</h2>
<!-- TMPL_IF NAME="loggedinusername" -->
<p>
@@ -82,10 +90,9 @@
<input type="submit" value="Changer la langue" class="button">
</p>
</form>
+</div>
<p class="copyright">
- Cette bibliothèque est équipée de <a href="http://www.koha.org">Koha</a>, SIGB sous licence libre, respectueuse des standards du web <a href="http://validator.w3.org/check/referer">
- <img src="http://www.w3.org/Icons/valid-xhtml10" alt="XHTML 1.0 valide !" height="16" width="44">
- </a>
+ Cette bibliothèque est équipée de <a href="http://www.koha.org">Koha</a>, SIGB sous licence libre, respectueuse des standards du web
</p>
</div>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl 2006-01-05 18:55:05.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-searchresults.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -36,6 +36,7 @@
</p>
</div>
<!-- Search Results Table -->
+<div class="bloc60">
<!-- TMPL_IF NAME="total" -->
<form action="opac-searchresults.pl" method="get" name="myform">
<input type="submit" class="button" value="Ajouter les éléments cochés au panier" onclick="addMultiple(); return false;"> <input type="reset" value="Effacer Tout" class="button">
@@ -122,6 +123,7 @@
</tr>
</table>
</form>
+</div>
<p class="center">
Réponses <i><!-- TMPL_VAR NAME="from" --></i> à <i><!-- TMPL_VAR NAME="to" --></i> sur <i><!-- TMPL_VAR NAME="total" --></i> réponses.
</p>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-search.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-search.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-search.tmpl 2006-01-05 18:55:05.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-search.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -5,7 +5,7 @@
<form name="f" method="post" action="<!-- TMPL_VAR name="SCRIPT_NAME" -->">
- <div id="bloc60">
+ <div class="bloc60">
<h2 class="catalogue">Chercher dans</h2>
<p>
<input type="hidden" name="op" value="do_search" />
@@ -43,7 +43,7 @@
<!-- /TMPL_UNLESS -->
</p>
<p>
- <label class="label20">Sujet</label>
+ <label class="label20">Classification AMS</label>
<input type="hidden" name="marclist" value="bibliosubject.subject" />
<input type="hidden" name="and_or" value="and" />
<input type="hidden" name="excluding" value="" />
@@ -80,7 +80,7 @@
<!-- TMPL_VAR name="CGIbranch" -->
</p>
</div>
- <div id="bloc20">
+ <div class="bloc60">
<h2>Autres options</h2>
<p>
<label class="label20">Code à barres</label>
@@ -159,7 +159,7 @@
<input type="submit" value="Lancer la recherche" class="button catalogue">
<input type="reset" value="Effacer Tout" class="button catalogue">
</p>
- <div id="bloc60">
+ <div class="bloc60">
<h2>Conseils</h2>
<h3>Titre</h3>
<p>Vous pouvez entrer un titre complet ou partiel. La recherche sera faite aussi sur les sous titre et les autres champs relatifs au titre</p>
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-shelves.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-shelves.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-shelves.tmpl 2006-01-05 18:55:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-shelves.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,5 +1,6 @@
<!-- TMPL_INCLUDE Name="opac-top.inc" -->
<div id="mainbloc">
+<!-- TMPL_IF name="virtualshelves" -->
<!-- TMPL_IF Name="viewshelf" -->
<form action="/cgi-bin/koha/opac-shelves.pl" method="get">
<h1><!-- TMPL_VAR NAME="shelfname" --></h1>
@@ -184,5 +185,6 @@
</form>
</div>
<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE Name="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-suggestions.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-suggestions.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-suggestions.tmpl 2006-01-05 18:55:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-suggestions.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,5 +1,6 @@
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<div id="mainbloc">
+<div class="bloc60">
<!-- TMPL_IF name="op_add" -->
<h1>Saisir une nouvelle suggestion</h1>
<p>Remplissez ce formulaire pour suggérer une nouvelle acquisition. Vous serez prévenu par messagerie lorsque la bibliothèque traitera votre suggestion</p>
@@ -153,4 +154,5 @@
<p>Note : si vous cherchez dans les suggestions faites par chacun, la liste ne contiendra que les nouvelles suggestions.Les suggestions déjà traitées par un bibliothécaire n'apparaîtront pas.</p>
<!-- /TMPL_IF -->
</div>
+</div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-user.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-user.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-user.tmpl 2006-01-05 18:55:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-user.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,7 +1,7 @@
<!-- TMPL_INCLUDE NAME="opac-top.inc" -->
<div id="mainbloc">
<!-- TMPL_LOOP NAME="BORROWER_INFO" -->
- <div class="bloc20">
+ <div class="bloc60">
<h2>Ces informations sont-elles correctes ?</h2>
<p>Identifiant <!-- TMPL_VAR NAME="cardnumber" --> </p>
<p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-userupdate.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-userupdate.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/css/fr/opac-userupdate.tmpl 2006-01-05 18:55:06.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/css/fr/opac-userupdate.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -1,6 +1,7 @@
<!-- TMPL_INCLUDE name="opac-top.inc" -->
<div id="mainbloc">
+<div class="bloc60">
<h2>Modifier vos informations</h2>
<p><i> Merci de changer ce qui doit l'être. Un message sera envoyé à la bibliothèque.<br />
Vos modifications n'apparaîtront pas avant la validation de la bibliothèque</i></p>
@@ -19,5 +20,6 @@
<p><input type="submit" value="Soumettre" class="button"></p>
</form>
</div>
+</div>
<!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE name="opac-bottom.inc" -->
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/opac-html/opac-tmpl/npl/en/opac-search.tmpl cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/npl/en/opac-search.tmpl
--- koha-2.2.5/opac-html/opac-tmpl/npl/en/opac-search.tmpl 2005-09-29 00:09:35.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/opac-html/opac-tmpl/npl/en/opac-search.tmpl 2006-08-24 22:17:40.000000000 +0300
@@ -56,7 +56,7 @@
<input type="hidden" name="excluding" value="" />
<input type="hidden" name="operator" value="contains" />
<input type="text" id="author" name="value" /><!-- TMPL_UNLESS NAME="Disable_Dictionary" --><a href="javascript:Dopop('opac-dictionary.pl?marclist=biblio.author&type=intranet&index=2',2)"><strong>...</strong></a><!-- /TMPL_UNLESS --></td></tr>
-<tr><th><label for="subject">Subject</label></th><td>
+<tr><th><label for="subject">AMS classification</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="" />
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/scripts/z3950daemon/processz3950queue cdkoha/koha-2.2.5.nit.imar/scripts/z3950daemon/processz3950queue
--- koha-2.2.5/scripts/z3950daemon/processz3950queue 2005-06-16 18:51:05.000000000 +0300
+++ cdkoha/koha-2.2.5.nit.imar/scripts/z3950daemon/processz3950queue 2007-03-21 21:29:41.000000000 +0200
@@ -209,6 +209,7 @@
$attr='1=1016';
}
my $query="\@attr $attr \"$term\"";
+ print "Query $query";
print "$$/$id : Processing $type=$term at $name $server $database $syntax (".($forkcounter+1)." forks)\n";
# try to connect
my $conn;
@@ -257,7 +258,7 @@
#######
print "$$/$id : connected to $globalname\n";
eval {$conn->option(elementSetName => 'F')};
- eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "MARC21");
+ eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::USMARC);} if ($globalsyntax eq "USMARC");
eval { $conn->option(preferredRecordSyntax => Net::Z3950::RecordSyntax::UNIMARC);} if ($globalsyntax eq "UNIMARC");
if ($@) {
print "$$/$id : $globalname ERROR: $@ for $resultsid\n";
@@ -280,6 +281,7 @@
my $scantimerstart=time();
for ($i=1; $i<=(($numresults<80) ? ($numresults) : (80)); $i++) {
my $rec=$rs->record($i);
+ #print $rec->render();
my $marcdata = $rec->rawdata();
$globalencoding = ref($rec);
$result.=$marcdata;
diff -Naur -x koha.mysql -x '*.gif' -x '*.css' koha-2.2.5/scripts/z3950daemon/z3950-daemon-options cdkoha/koha-2.2.5.nit.imar/scripts/z3950daemon/z3950-daemon-options
--- koha-2.2.5/scripts/z3950daemon/z3950-daemon-options 1970-01-01 02:00:00.000000000 +0200
+++ cdkoha/koha-2.2.5.nit.imar/scripts/z3950daemon/z3950-daemon-options 2006-08-24 22:17:39.000000000 +0300
@@ -0,0 +1,5 @@
+RunAsUser=nobody
+KohaZ3950Dir=/usr/local/koha/intranet/scripts/z3950daemon
+KohaModuleDir=/usr/local/koha/intranet/modules
+LogDir=/usr/local/koha/log
+KohaConf=/etc/koha.conf
\ No newline at end of file
Implementare Koha in limba romana