From sjohnson at hpplnj.org Sat Dec 1 12:00:10 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Sat, 1 Dec 2012 06:00:10 -0500 Subject: [Koha-patches] Out of office Message-ID: <3061496523a842b09ccca7cf0aa80762@2ece6fa0b8f34da68b9d3acb30b1d6e9> I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Sun Dec 2 12:00:11 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Sun, 2 Dec 2012 06:00:11 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Mon Dec 3 12:00:10 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Mon, 3 Dec 2012 06:00:10 -0500 Subject: [Koha-patches] Out of office Message-ID: <5b0e1b0adbe44301a7e3eaa5c47afe4e@8a0ac58e66ba4cd084525de4edc22e18> I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Tue Dec 4 12:01:16 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Tue, 4 Dec 2012 06:01:16 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From tomascohen at gmail.com Tue Dec 4 19:28:06 2012 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 4 Dec 2012 15:28:06 -0300 Subject: [Koha-patches] [PATCH] Bug 9209 - Mocked Koha::Calendar tests Message-ID: <1354645686-26639-1-git-send-email-tomascohen@gmail.com> Using specific method for populating the internal data structures from Koha::Calendar has yielded to the non-detection of several bugs. There are also several tests that where db_dependent which is not always desirable. I propose the use of DBD::Mock (::Session) for using the actual code used by Koha in production for testing, mocking the DB queries itselves. I also took the time to repeat several tests in different syspref configurations (they applied only to daysMode=Calendar, and now cover all confs). Notes: - I used DBD:Mock 1.45 as previous version (1.43, from 12.04) was broken - Some tests revealed a bug on days_between as I see it... reporting as Bug #9211 Sponsored-by: Universidad Nacional de C?rdoba --- Koha/Calendar.pm | 30 +++-- t/Calendar.t | 351 ++++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 264 insertions(+), 117 deletions(-) diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm index 90069b6..45841be 100644 --- a/Koha/Calendar.pm +++ b/Koha/Calendar.pm @@ -33,28 +33,31 @@ sub _init { my $self = shift; my $branch = $self->{branchcode}; my $dbh = C4::Context->dbh(); - my $repeat_sth = $dbh->prepare( -'SELECT * from repeatable_holidays WHERE branchcode = ? AND ISNULL(weekday) = ?' + my $weekly_closed_days_sth = $dbh->prepare( +'SELECT weekday FROM repeatable_holidays WHERE branchcode = ? AND weekday IS NOT NULL' ); - $repeat_sth->execute( $branch, 0 ); + $weekly_closed_days_sth->execute( $branch ); $self->{weekly_closed_days} = [ 0, 0, 0, 0, 0, 0, 0 ]; Readonly::Scalar my $sunday => 7; - while ( my $tuple = $repeat_sth->fetchrow_hashref ) { + while ( my $tuple = $weekly_closed_days_sth->fetchrow_hashref ) { $self->{weekly_closed_days}->[ $tuple->{weekday} ] = 1; } - $repeat_sth->execute( $branch, 1 ); + my $day_month_closed_days_sth = $dbh->prepare( +'SELECT day, month FROM repeatable_holidays WHERE branchcode = ? AND weekday IS NULL' + ); + $day_month_closed_days_sth->execute( $branch ); $self->{day_month_closed_days} = {}; - while ( my $tuple = $repeat_sth->fetchrow_hashref ) { + while ( my $tuple = $day_month_closed_days_sth->fetchrow_hashref ) { $self->{day_month_closed_days}->{ $tuple->{month} }->{ $tuple->{day} } = 1; } - my $special = $dbh->prepare( -'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = ?' + my $exception_holidays_sth = $dbh->prepare( +'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 1' ); - $special->execute( $branch, 1 ); + $exception_holidays_sth->execute( $branch ); my $dates = []; - while ( my ( $day, $month, $year ) = $special->fetchrow ) { + while ( my ( $day, $month, $year ) = $exception_holidays_sth->fetchrow ) { push @{$dates}, DateTime->new( day => $day, @@ -66,9 +69,12 @@ sub _init { $self->{exception_holidays} = DateTime::Set->from_datetimes( dates => $dates ); - $special->execute( $branch, 0 ); + my $single_holidays_sth = $dbh->prepare( +'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 0' + ); + $single_holidays_sth->execute( $branch ); $dates = []; - while ( my ( $day, $month, $year ) = $special->fetchrow ) { + while ( my ( $day, $month, $year ) = $single_holidays_sth->fetchrow ) { push @{$dates}, DateTime->new( day => $day, diff --git a/t/Calendar.t b/t/Calendar.t index 42b8342..2557ed6 100755 --- a/t/Calendar.t +++ b/t/Calendar.t @@ -4,7 +4,9 @@ use strict; use warnings; use DateTime; use DateTime::Duration; -use Test::More tests => 26; +use Test::More tests => 35; +use Test::MockModule; +use DBD::Mock; use Koha::DateUtils; BEGIN { @@ -15,124 +17,202 @@ BEGIN { use_ok('C4::Calendar'); } -my $cal = Koha::Calendar->new( TEST_MODE => 1 ); +my $module_context = new Test::MockModule('C4::Context'); +$module_context->mock( + '_new_dbh', + sub { + my $dbh = DBI->connect( 'DBI:Mock:', '', '' ) + || die "Cannot create handle: $DBI::errstr\n"; + return $dbh; + } +); + +# We need to mock the C4::Context->preference method for +# simplicity and re-usability of the session definition. Any +# syspref fits for syspref-agnostic tests. +$module_context->mock( + 'preference', + sub { + return 'Calendar'; + } +); + + +my $holidays_session = DBD::Mock::Session->new('holidays_session' => ( + { # weekly holidays + statement => "SELECT weekday FROM repeatable_holidays WHERE branchcode = ? AND weekday IS NOT NULL", + results => [ + ['weekday'], + [0], # sundays + [6] # saturdays + ] + }, + { # day and month repeatable holidays + statement => "SELECT day, month FROM repeatable_holidays WHERE branchcode = ? AND weekday IS NULL", + results => [ + [ 'month', 'day' ], + [ 1, 1 ], # new year's day + [12,25] # christmas + ] + }, + { # exception holidays + statement => "SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 1", + results => [ + [ 'day', 'month', 'year' ], + [ 11, 11, 2012 ] # sunday exception + ] + }, + { # single holidays + statement => "SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 0", + results => [ + [ 'day', 'month', 'year' ], + [ 1, 6, 2011 ], # single holiday + [ 4, 7, 2012 ] + ] + } +)); + +# Initialize the global $dbh variable +my $dbh = C4::Context->dbh(); +# Apply the mock session +$dbh->{ mock_session } = $holidays_session; +# 'MPL' branch is arbitrary, is not used at all but is needed for initialization +my $cal = Koha::Calendar->new( branchcode => 'MPL' ); isa_ok( $cal, 'Koha::Calendar', 'Calendar class returned' ); + my $saturday = DateTime->new( - year => 2011, - month => 6, - day => 25, - time_zone => 'Europe/London', + year => 2012, + month => 11, + day => 24, ); + my $sunday = DateTime->new( - year => 2011, - month => 6, - day => 26, - time_zone => 'Europe/London', + year => 2012, + month => 11, + day => 25, ); + my $monday = DateTime->new( - year => 2011, - month => 6, - day => 27, - time_zone => 'Europe/London', + year => 2012, + month => 11, + day => 26, ); -my $bloomsday = DateTime->new( - year => 2011, - month => 6, - day => 16, - time_zone => 'Europe/London', -); # should be a holiday -my $special = DateTime->new( + +my $new_year = DateTime->new( + year => 2013, + month => 1, + day => 1, +); + +my $single_holiday = DateTime->new( year => 2011, month => 6, day => 1, - time_zone => 'Europe/London', ); # should be a holiday + my $notspecial = DateTime->new( year => 2011, month => 6, - day => 2, - time_zone => 'Europe/London', + day => 2 ); # should NOT be a holiday -is( $cal->is_holiday($sunday), 1, 'Sunday is a closed day' ); # wee free test; -is( $cal->is_holiday($monday), 0, 'Monday is not a closed day' ); # alas -is( $cal->is_holiday($bloomsday), 1, 'month/day closed day test' ); -is( $cal->is_holiday($special), 1, 'special closed day test' ); -is( $cal->is_holiday($notspecial), 0, 'open day test' ); +my $sunday_exception = DateTime->new( + year => 2012, + month => 11, + day => 11 +); -my $dt = $cal->addDate( $saturday, 1, 'days' ); -is( $dt->day_of_week, 1, 'addDate skips closed Sunday' ); +my $day_after_christmas = DateTime->new( + year => 2012, + month => 12, + day => 26 +); # for testing negative addDate + + +{ # Syspref-agnostic tests + is ( $saturday->day_of_week, 6, '\'$saturday\' is actually a saturday (6th day of week)'); + is ( $sunday->day_of_week, 7, '\'$sunday\' is actually a sunday (7th day of week)'); + is ( $monday->day_of_week, 1, '\'$monday\' is actually a monday (1st day of week)'); + is ( $cal->is_holiday($saturday), 1, 'Saturday is a closed day' ); + is ( $cal->is_holiday($sunday), 1, 'Sunday is a closed day' ); + is ( $cal->is_holiday($monday), 0, 'Monday is not a closed day' ); + is ( $cal->is_holiday($new_year), 1, 'Month/Day closed day test (New year\'s day)' ); + is ( $cal->is_holiday($single_holiday), 1, 'Single holiday closed day test' ); + is ( $cal->is_holiday($notspecial), 0, 'Fixed single date that is not a holiday test' ); + is ( $cal->is_holiday($sunday_exception), 0, 'Exception holiday is not a closed day test' ); +} -$dt = $cal->addDate( $bloomsday, -1 ); -is( $dt->ymd(), '2011-06-15', 'Negative call to addDate' ); -my $test_dt = DateTime->new( # Monday - year => 2012, - month => 7, - day => 23, - hour => 11, - minute => 53, - time_zone => 'Europe/London', -); +{ # Bugzilla #8966 - is_holiday truncates referenced date + my $later_dt = DateTime->new( # Monday + year => 2012, + month => 9, + day => 17, + hour => 17, + minute => 30, + time_zone => 'Europe/London', + ); -my $later_dt = DateTime->new( # Monday - year => 2012, - month => 9, - day => 17, - hour => 17, - minute => 30, - time_zone => 'Europe/London', -); -my $daycount = $cal->days_between( $test_dt, $later_dt ); -cmp_ok( $daycount->in_units('days'), - '==', 48, 'days_between calculates correctly' ); - -my $ret; - -$cal->set_daysmode('Calendar'); - -# see bugzilla #8966 -is( $cal->is_holiday($later_dt), 0, 'is holiday for the next test' ); -cmp_ok( $later_dt, 'eq', '2012-09-17T17:30:00', 'Date should be the same after is_holiday' ); - -# example tests for bug report -$cal->clear_weekly_closed_days(); - -$daycount = $cal->days_between( dt_from_string('2012-01-10','iso'), - dt_from_string("2012-05-05",'iso') )->in_units('days'); -cmp_ok( $daycount, '==', 116, 'test larger intervals' ); -$daycount = $cal->days_between( dt_from_string("2012-01-01",'iso'), - dt_from_string("2012-05-05",'iso') )->in_units('days'); -cmp_ok( $daycount, '==', 125, 'test positive intervals' ); -my $daycount2 = $cal->days_between( dt_from_string("2012-05-05",'iso'), - dt_from_string("2012-01-01",'iso') )->in_units('days'); -cmp_ok( $daycount2, '==', $daycount, 'test parameter order not relevant' ); -$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), - dt_from_string("2012-07-15",'iso') )->in_units('days'); -cmp_ok( $daycount, '==', 14, 'days_between calculates correctly' ); -$cal->add_holiday( dt_from_string('2012-07-06','iso') ); -$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), - dt_from_string("2012-07-15",'iso') )->in_units('days'); -cmp_ok( $daycount, '==', 13, 'holiday correctly recognized' ); - -$cal->add_holiday( dt_from_string('2012-07-07','iso') ); -$daycount = $cal->days_between( dt_from_string("2012-07-01",'iso'), - dt_from_string("2012-07-15",'iso') )->in_units('days'); -cmp_ok( $daycount, '==', 12, 'multiple holidays correctly recognized' ); - -my $one_day_dur = DateTime::Duration->new( days => 1 ); -my $two_day_dur = DateTime::Duration->new( days => 2 ); -my $seven_day_dur = DateTime::Duration->new( days => 7 ); - - ## 'Datedue' tests - $cal = Koha::Calendar->new( TEST_MODE => 1 , - days_mode => 'Datedue'); - - $cal->add_holiday( dt_from_string('2012-07-04','iso') ); - $dt = dt_from_string( '2012-07-03','iso' ); + is( $cal->is_holiday($later_dt), 0, 'bz-8966 (1/2) Apply is_holiday for the next test' ); + cmp_ok( $later_dt, 'eq', '2012-09-17T17:30:00', 'bz-8966 (2/2) Date should be the same after is_holiday' ); +} + + +{ # Bugzilla #8800 - is_holiday should use truncated date for 'contains' call + my $single_holiday_time = DateTime->new( + year => 2011, + month => 6, + day => 1, + hour => 11, + minute => 2 + ); + + is( $cal->is_holiday($single_holiday_time), + $cal->is_holiday($single_holiday) , + 'bz-8800 is_holiday should truncate the date for holiday validation' ); +} + + + my $one_day_dur = DateTime::Duration->new( days => 1 ); + my $two_day_dur = DateTime::Duration->new( days => 2 ); + my $seven_day_dur = DateTime::Duration->new( days => 7 ); + + my $dt = dt_from_string( '2012-07-03','iso' ); + my $test_dt = DateTime->new( # Monday + year => 2012, + month => 7, + day => 23, + hour => 11, + minute => 53, + ); + + my $later_dt = DateTime->new( # Monday + year => 2012, + month => 9, + day => 17, + hour => 17, + minute => 30, + time_zone => 'Europe/London', + ); + + +{ ## 'Datedue' tests + + $module_context->unmock('preference'); + $module_context->mock( + 'preference', + sub { + return 'Datedue'; + } + ); + # rewind dbh session + $holidays_session->reset; + + + $cal = Koha::Calendar->new( branchcode => 'MPL' ); is($cal->addDate( $dt, $one_day_dur, 'days' ), dt_from_string('2012-07-05','iso'), @@ -146,13 +226,38 @@ my $seven_day_dur = DateTime::Duration->new( days => 7 ); '2012-07-30T11:53:00', 'Add 7 days (Datedue)' ); + is( $cal->addDate( $saturday, $one_day_dur, 'days' )->day_of_week, 1, + 'addDate skips closed Sunday (Datedue)' ); + + is( $cal->addDate($day_after_christmas, -1, 'days')->ymd(), '2012-12-24', + 'Negative call to addDate (Datedue)' ); + + ## Note that the days_between API says closed days are not considered. + ## This tests are here as an API test. + cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'), + '==', 40, 'days_between calculates correctly (Days)' ); + cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'), + '==', 40, 'Test parameter order not relevant (Days)' ); - ## 'Calendar' tests' - $cal = Koha::Calendar->new( TEST_MODE => 1, - days_mode => 'Calendar' ); - $cal->add_holiday( dt_from_string('2012-07-04','iso') ); +} + + +{ ## 'Calendar' tests' + + $module_context->unmock('preference'); + $module_context->mock( + 'preference', + sub { + return 'Calendar'; + } + ); + # rewind dbh session + $holidays_session->reset; + + $cal = Koha::Calendar->new( branchcode => 'MPL' ); + $dt = dt_from_string('2012-07-03','iso'); is($cal->addDate( $dt, $one_day_dur, 'days' ), @@ -160,16 +265,36 @@ my $seven_day_dur = DateTime::Duration->new( days => 7 ); 'Single day add (Calendar)' ); cmp_ok($cal->addDate( $test_dt, $seven_day_dur, 'days' ), 'eq', - '2012-07-31T11:53:00', + '2012-08-01T11:53:00', 'Add 7 days (Calendar)' ); + is( $cal->addDate( $saturday, $one_day_dur, 'days' )->day_of_week, 1, + 'addDate skips closed Sunday (Calendar)' ); + + is( $cal->addDate($day_after_christmas, -1, 'days')->ymd(), '2012-12-24', + 'Negative call to addDate (Calendar)' ); + cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'), + '==', 40, 'days_between calculates correctly (Calendar)' ); + + cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'), + '==', 40, 'Test parameter order not relevant (Calendar)' ); +} - ## 'Days' tests - $cal = Koha::Calendar->new( TEST_MODE => 1, - days_mode => 'Days' ); - $cal->add_holiday( dt_from_string('2012-07-04','iso') ); +{ ## 'Days' tests + $module_context->unmock('preference'); + $module_context->mock( + 'preference', + sub { + return 'Days'; + } + ); + # rewind dbh session + $holidays_session->reset; + + $cal = Koha::Calendar->new( branchcode => 'MPL' ); + $dt = dt_from_string('2012-07-03','iso'); is($cal->addDate( $dt, $one_day_dur, 'days' ), @@ -179,3 +304,19 @@ my $seven_day_dur = DateTime::Duration->new( days => 7 ); cmp_ok($cal->addDate( $test_dt, $seven_day_dur, 'days' ),'eq', '2012-07-30T11:53:00', 'Add 7 days (Days)' ); + + is( $cal->addDate( $saturday, $one_day_dur, 'days' )->day_of_week, 7, + 'addDate doesn\'t skip closed Sunday (Days)' ); + + is( $cal->addDate($day_after_christmas, -1, 'days')->ymd(), '2012-12-25', + 'Negative call to addDate (Days)' ); + + ## Note that the days_between API says closed days are not considered. + ## This tests are here as an API test. + cmp_ok( $cal->days_between( $test_dt, $later_dt )->in_units('days'), + '==', 40, 'days_between calculates correctly (Days)' ); + + cmp_ok( $cal->days_between( $later_dt, $test_dt )->in_units('days'), + '==', 40, 'Test parameter order not relevant (Days)' ); + +} -- 1.7.10.4 From tomascohen at gmail.com Tue Dec 4 19:35:59 2012 From: tomascohen at gmail.com (Tomas Cohen Arazi) Date: Tue, 4 Dec 2012 15:35:59 -0300 Subject: [Koha-patches] [PATCH] Bug 9211 - days_between wrong behaviour Message-ID: <1354646159-26830-1-git-send-email-tomascohen@gmail.com> As noted in comments #15, #16 and #17 of bug 8486, and its API, Koha::Calendar->days_between should always returns a positive number irrespective of the relative order of the parameters. This is still an open bug, which arised when rewriting the Calendar.t file (Bug 9209). Regards To+ Sponsored-by: Universidad Nacional de C?rdoba --- Koha/Calendar.pm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm index 45841be..6a12530 100644 --- a/Koha/Calendar.pm +++ b/Koha/Calendar.pm @@ -247,6 +247,13 @@ sub days_between { my $start_dt = shift; my $end_dt = shift; + if ( $start_dt->compare($end_dt) > 0 ) { + # swap dates + my $int_dt = $end_dt; + $end_dt = $start_dt; + $start_dt = $int_dt; + } + # start and end should not be closed days my $days = $start_dt->delta_days($end_dt)->delta_days; -- 1.7.10.4 From sjohnson at hpplnj.org Wed Dec 5 12:00:15 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Wed, 5 Dec 2012 06:00:15 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ecc at vnz.uci.cu Wed Dec 5 22:54:45 2012 From: ecc at vnz.uci.cu (Edisnel Carrazana Castro) Date: Wed, 5 Dec 2012 17:24:45 -0430 Subject: [Koha-patches] call number sorting Message-ID: <294D3D02D5E18D42827B2ECFEADEB68868AA1D5C8E@mx-interno.vnz.uci.cu> Greetings. I have a problem with the call number sorting in the OPAC, koha version 3.00.06. I have been review the list but nothing. In the marc records, the call number is in the 082 field, that is associated to cn_class index. Or is that the call number sorting is made it by another field and not by the 082 ?? Please any help. Thanks Fin a la injusticia, LIBERTAD AHORA A NUESTROS CINCO COMPATRIOTAS QUE SE ENCUENTRAN INJUSTAMENTE EN PRISIONES DE LOS EEUU! http://www.antiterroristas.cu http://justiciaparaloscinco.wordpress.com From sjohnson at hpplnj.org Thu Dec 6 12:00:12 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Thu, 6 Dec 2012 06:00:12 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Fri Dec 7 12:00:13 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Fri, 7 Dec 2012 06:00:13 -0500 Subject: [Koha-patches] Out of office Message-ID: <747a0d889b6b4520b2f4fdd59c605edb@07ebc3472030430f9e1e0327f1bbb188> I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From christophe.croullebois at biblibre.com Fri Dec 7 15:39:57 2012 From: christophe.croullebois at biblibre.com (Christophe Croullebois) Date: Fri, 7 Dec 2012 15:39:57 +0100 Subject: [Koha-patches] [PATCH 1/1] Bug 9243: Bad delete order in sub index-records Message-ID: <1354891197-5060-1-git-send-email-christophe.croullebois@biblibre.com> If we have in the zebraqueue table for the same record, one line "update" and another "delete", the index_records sub in rebuild_zebra.pl treats the delete line first. The result is that the record still exists in zebra. --- misc/migration_tools/rebuild_zebra.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl index 0e24df5..854841e 100755 --- a/misc/migration_tools/rebuild_zebra.pl +++ b/misc/migration_tools/rebuild_zebra.pl @@ -216,15 +216,15 @@ sub index_records { mkdir "$directory" unless (-d $directory); mkdir "$directory/$record_type" unless (-d "$directory/$record_type"); if ($process_zebraqueue) { - my $entries = select_zebraqueue_records($record_type, 'deleted'); - mkdir "$directory/del_$record_type" unless (-d "$directory/del_$record_type"); - $records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml); - mark_zebraqueue_batch_done($entries); - $entries = select_zebraqueue_records($record_type, 'updated'); + my $entries = select_zebraqueue_records($record_type, 'updated'); mkdir "$directory/upd_$record_type" unless (-d "$directory/upd_$record_type"); $num_records_exported = export_marc_records_from_list($record_type, $entries, "$directory/upd_$record_type", $as_xml, $noxml, $records_deleted); mark_zebraqueue_batch_done($entries); + $entries = select_zebraqueue_records($record_type, 'deleted'); + mkdir "$directory/del_$record_type" unless (-d "$directory/del_$record_type"); + $records_deleted = generate_deleted_marc_records($record_type, $entries, "$directory/del_$record_type", $as_xml); + mark_zebraqueue_batch_done($entries); } else { my $sth = select_all_records($record_type); $num_records_exported = export_marc_records_from_sth($record_type, $sth, "$directory/$record_type", $as_xml, $noxml, $nosanitize); -- 1.7.9.5 From sjohnson at hpplnj.org Sat Dec 8 12:00:27 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Sat, 8 Dec 2012 06:00:27 -0500 Subject: [Koha-patches] Out of office Message-ID: <58e9ada8f8814e69b41dc43385c97897@3469cb41101544caaf5551df784bd6b8> I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Sun Dec 9 12:00:31 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Sun, 9 Dec 2012 06:00:31 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From sjohnson at hpplnj.org Mon Dec 10 12:00:35 2012 From: sjohnson at hpplnj.org (sjohnson at hpplnj.org) Date: Mon, 10 Dec 2012 06:00:35 -0500 Subject: [Koha-patches] Out of office Message-ID: I will be out of the office beginning Saturday November 17, 2012 and will return on Monday December 10, 2012.  If you need immediate assistance please call the Highland Park Public Library at 732-572-2750. -------------- next part -------------- An HTML attachment was scrubbed... URL: From ecc at vnz.uci.cu Mon Dec 10 14:35:33 2012 From: ecc at vnz.uci.cu (Edisnel Carrazana Castro) Date: Mon, 10 Dec 2012 09:05:33 -0430 Subject: [Koha-patches] call number in opac Message-ID: <294D3D02D5E18D42827B2ECFEADEB68868AA1D5C9F@mx-interno.vnz.uci.cu> Greetings. I have a problem with the call number sorting in the OPAC, koha version 3.00.06. I have been review the list but nothing. In the marc records, the call number is in the 082 field, that is associated to cn_class index. Or is that the call number sorting is made it by another field and not by the 082 ?? Please any help. Thanks Fin a la injusticia, LIBERTAD AHORA A NUESTROS CINCO COMPATRIOTAS QUE SE ENCUENTRAN INJUSTAMENTE EN PRISIONES DE LOS EEUU! http://www.antiterroristas.cu http://justiciaparaloscinco.wordpress.com From jcamins at cpbibliography.com Mon Dec 10 14:15:02 2012 From: jcamins at cpbibliography.com (Jared Camins-Esakov) Date: Mon, 10 Dec 2012 08:15:02 -0500 Subject: [Koha-patches] call number in opac In-Reply-To: <294D3D02D5E18D42827B2ECFEADEB68868AA1D5C9F@mx-interno.vnz.uci.cu> References: <294D3D02D5E18D42827B2ECFEADEB68868AA1D5C9F@mx-interno.vnz.uci.cu> Message-ID: Edisnel, Greetings. I have a problem with the call number sorting in the OPAC, koha > version 3.00.06. I have been > review the list but nothing. > In the marc records, the call number is in the 082 field, that is > associated to cn_class index. Or is that the > call number sorting is made it by another field and not by the 082 ?? > 3.0.6 is a very, *very* old version, and not really supported anymore, at least not by volunteers. However, I think you will find that call number sorting is done with reference to the item call numbers stored in 952$o. Regards, Jared -- Jared Camins-Esakov Bibliographer, C & P Bibliography Services, LLC (phone) +1 (917) 727-3445 (e-mail) jcamins at cpbibliography.com (web) http://www.cpbibliography.com/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From robin at catalyst.net.nz Tue Dec 11 03:28:52 2012 From: robin at catalyst.net.nz (Robin Sheat) Date: Tue, 11 Dec 2012 15:28:52 +1300 Subject: [Koha-patches] [PATCH] Bug 9250 - provide commands to manage the SIP server Message-ID: <1355192932-30792-1-git-send-email-robin@catalyst.net.nz> This adds commands required to control the SIP server. These commands are: * koha-enable-sip - copies the SIP config to the sites directory * koha-start-sip - starts the SIP server processes * koha-stop-sip - stops the SIP server processes It also calls these as appropriate from the koha-common init script. To use: 1) sudo koha-enable-sip instancename 2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml Do whatever is needed for your site's SIP configuration 3) sudo koha-start-sip instancename To test: 1) Build packages with this patch 2) Ensure that sudo koha-start-sip instancename doesn't do anything 3) Run sudo koha-enable-sip instancename 4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably not required for testing) 5) Run sudo koha-start-sip instancename 6) Note that the sip processes are now running 7) Run sudo koha-stop-sip instancename 8) Note that the sip processes have gone 9) Reboot your Koha server 10) Note that the sip processes are back Sponsored-By: Waitaki District Council Libraries Sponsored-By: South Taranaki District Council Libraries Sponsored-By: Horowhenua District Council Libraries Sponsored-By: Rangitikei District Council Libraries --- debian/docs/koha-enable-sip.xml | 58 +++++++++++++++++++++++++++++++++++++++ debian/docs/koha-start-sip.xml | 53 +++++++++++++++++++++++++++++++++++ debian/docs/koha-stop-sip.xml | 53 +++++++++++++++++++++++++++++++++++ debian/koha-common.init | 4 +++ debian/koha-common.install | 3 ++ debian/scripts/koha-enable-sip | 38 +++++++++++++++++++++++++ debian/scripts/koha-start-sip | 49 +++++++++++++++++++++++++++++++++ debian/scripts/koha-stop-sip | 52 +++++++++++++++++++++++++++++++++++ 8 files changed, 310 insertions(+) create mode 100644 debian/docs/koha-enable-sip.xml create mode 100644 debian/docs/koha-start-sip.xml create mode 100644 debian/docs/koha-stop-sip.xml create mode 100755 debian/scripts/koha-enable-sip create mode 100755 debian/scripts/koha-start-sip create mode 100755 debian/scripts/koha-stop-sip diff --git a/debian/docs/koha-enable-sip.xml b/debian/docs/koha-enable-sip.xml new file mode 100644 index 0000000..c9c0d7c --- /dev/null +++ b/debian/docs/koha-enable-sip.xml @@ -0,0 +1,58 @@ +
+koha-enable-sip + + Koha is the first free software library automation package. + + + Robin + Sheat + + + Catalyst IT + http://www.catalyst.net.nz + + Author + + + + + + + koha-enable-sip + 8 + + + + koha-enable-sip + Copies the SIP configuration file to allow SIP to be controlled by init scripts. + UNIX/Linux + + + + + koha-enable-sip + instancename + + + + Description + This copies the default SIP configuration file /etc/koha/SIPconfig.xml to the + /etc/koha/sites/instancename directory. This allows it to be started by + koha-start-sip(8), and koha-stop-sip. In turn, + this means that it will be started on boot and stopped on shutdown. + After running this, you will need to edit the newly created file to configure it + for your site. + To disable SIP again, delete or rename the configuration file. + + + See also + + koha-start-sip(8) + koha-stop-sip(8) + + + + + +
+ diff --git a/debian/docs/koha-start-sip.xml b/debian/docs/koha-start-sip.xml new file mode 100644 index 0000000..e49eb41 --- /dev/null +++ b/debian/docs/koha-start-sip.xml @@ -0,0 +1,53 @@ +
+koha-start-sip + + Koha is the first free software library automation package. + + + Robin + Sheat + + + Catalyst IT + http://www.catalyst.net.nz + + Author + + + + + + + koha-start-sip + 8 + + + + koha-start-sip + Starts the SIP daemon for the specified Koha instances. + UNIX/Linux + + + + + koha-start-sip + instancename + + + + Description + This will start the SIP daemon for the Koha instance specified by instancename. + If the SIP configuration is not present for the supplied instance, it will be silently skipped. + To enable SIP support for an instance, refer to koha-enable-sip(8). + + + See also + + koha-stop-sip(8) + koha-enable-sip(8) + + + + + +
diff --git a/debian/docs/koha-stop-sip.xml b/debian/docs/koha-stop-sip.xml new file mode 100644 index 0000000..1c72a47 --- /dev/null +++ b/debian/docs/koha-stop-sip.xml @@ -0,0 +1,53 @@ +
+koha-stop-sip + + Koha is the first free software library automation package. + + + Robin + Sheat + + + Catalyst IT + http://www.catalyst.net.nz + + Author + + + + + + + koha-stop-sip + 8 + + + + koha-stop-sip + Stops the SIP daemon for the specified Koha instances. + UNIX/Linux + + + + + koha-stop-sip + instancename + + + + Description + This will stop the SIP daemon for the Koha instance specified by instancename. + If it's not running, an note will be displayed. + + + See also + + koha-start-sip(8) + koha-enable-sip(8) + + + + + +
+ diff --git a/debian/koha-common.init b/debian/koha-common.init index 5be77d3..5089803 100755 --- a/debian/koha-common.init +++ b/debian/koha-common.init @@ -45,6 +45,7 @@ do_start() # We insure all required directories exist, including disabled ones. koha-create-dirs $(koha-list) koha-start-zebra $(koha-list --enabled) + koha-start-sip $(koha-list --enabled) } # @@ -54,6 +55,7 @@ do_stop() { # We stop everything, including disabled ones. koha-stop-zebra $(koha-list) || true + koha-stop-sip $(koha-list) || true } # @@ -61,6 +63,8 @@ do_stop() # do_reload() { koha-restart-zebra $(koha-list --enabled) + koha-stop-sip $(koha-list) || true + koha-start-sop $(koha-list --enabled) } case "$1" in diff --git a/debian/koha-common.install b/debian/koha-common.install index 50affbd..7ad13ee 100644 --- a/debian/koha-common.install +++ b/debian/koha-common.install @@ -28,4 +28,7 @@ debian/scripts/koha-start-zebra usr/sbin debian/scripts/koha-stop-zebra usr/sbin debian/scripts/koha-upgrade-schema usr/sbin debian/scripts/koha-upgrade-to-3.4 usr/sbin +debian/scripts/koha-start-sip usr/sbin +debian/scripts/koha-stop-sip usr/sbin +debian/scripts/koha-enable-sip usr/sbin debian/tmp_docbook/*.8 usr/share/man/man8 diff --git a/debian/scripts/koha-enable-sip b/debian/scripts/koha-enable-sip new file mode 100755 index 0000000..1bcdd97 --- /dev/null +++ b/debian/scripts/koha-enable-sip @@ -0,0 +1,38 @@ +#!/bin/sh +# +# koha-enable-sip -- Set up the config files to allow SIP to run +# Copyright 2012 Catalyst IT, Ltd +# +# 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 3 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, see . + +set -e + +for name in "$@" +do + if [ ! -e /etc/koha/sites/${name}/koha-conf.xml ] ; + then + echo "No such instance: ${name}" > /dev/stderr + continue; + fi + sipfile=/etc/koha/sites/${name}/SIPconfig.xml + if [ -e ${sipfile} ] + then + echo "SIP already enabled for $name" + else + echo "Enabling SIP for $name - edit ${sipfile} to configure" + cp -v /etc/koha/SIPconfig.xml ${sipfile} + chown ${name}-koha:${name}-koha ${sipfile} + chmod 600 ${sipfile} + fi +done diff --git a/debian/scripts/koha-start-sip b/debian/scripts/koha-start-sip new file mode 100755 index 0000000..c104af3 --- /dev/null +++ b/debian/scripts/koha-start-sip @@ -0,0 +1,49 @@ +#!/bin/sh +# +# koha-start-sip -- Start SIP server for named Koha instance +# Copyright 2012 Catalyst IT, Ltd +# +# 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 3 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, see . + +set -e + +for name in "$@" +do + if [ ! -e /etc/koha/sites/${name}/koha-conf.xml ] ; + then + echo "No such instance: ${name}" > /dev/stderr + continue; + fi + [ -e /etc/koha/sites/${name}/SIPconfig.xml ] || continue + echo "Starting SIP server for $name" + mkdir -p /var/run/koha/${name} + chown "${name}-koha:${name}-koha" /var/run/koha/${name} + export KOHA_CONF PERL5LIB + KOHA_CONF=/etc/koha/sites/${name}/koha-conf.xml + PERL5LIB=/usr/share/koha/lib + daemon \ + --name="$name-koha-sip" \ + --errlog="/var/log/koha/$name/sip-error.log" \ + --stdout="/var/log/koha/$name/sip.log" \ + --output="/var/log/koha/$name/sip-output.log" \ + --verbose=1 \ + --respawn \ + --delay=30 \ + --pidfiles="/var/run/koha/${name}" \ + --user="$name-koha.$name-koha" \ + -- \ + perl \ + "/usr/share/koha/lib/C4/SIP/SIPServer.pm" \ + "/etc/koha/sites/${name}/SIPconfig.xml" +done diff --git a/debian/scripts/koha-stop-sip b/debian/scripts/koha-stop-sip new file mode 100755 index 0000000..a6110e4 --- /dev/null +++ b/debian/scripts/koha-stop-sip @@ -0,0 +1,52 @@ +#!/bin/sh +# +# koha-stop-sip -- Stop SIP server for named Koha instance +# Copyright 2012 Catalyst IT, Ltd +# +# 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 3 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, see . + +set -e + +for name in "$@" +do + if [ ! -e /etc/koha/sites/${name}/koha-conf.xml ] ; + then + echo "No such instance: ${name}" > /dev/stderr + continue; + fi + if [ ! -e /var/run/koha/${name}/${name}-koha-sip.pid ] ; + then + echo "SIP server for ${name} not running." + continue; + fi + echo "Stopping SIP server for $name" + KOHA_CONF=/etc/koha/sites/${name}/koha-conf.xml + PERL5LIB=/usr/share/koha/lib + export KOHA_CONF PERL5LIB + daemon \ + --name="$name-koha-sip" \ + --errlog="/var/log/koha/$name/sip-error.log" \ + --stdout="/var/log/koha/$name/sip.log" \ + --output="/var/log/koha/$name/sip-output.log" \ + --verbose=1 \ + --respawn \ + --delay=30 \ + --pidfiles="/var/run/koha/${name}" \ + --user="$name-koha.$name-koha" \ + --stop \ + -- \ + perl \ + "/usr/share/koha/lib/C4/SIP/SIPServer.pm" \ + "/etc/koha/sites/${name}/SIPconfig.xml" +done -- 1.7.9.5 From oleonard at myacpl.org Tue Dec 11 17:05:45 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Tue, 11 Dec 2012 11:05:45 -0500 Subject: [Koha-patches] [PATCH] Bug 9115 [3.6.x] basket window should close automatically when placing a hold Message-ID: <1355241945-26313-1-git-send-email-oleonard@myacpl.org> If you choose to place a hold from the Cart pop-up, the entire holds process (possibly including login) takes place in the cart window. Upon completion of the operation you're left with a second window which has lost its context as the Cart. This patch revises the hold process so that when you click the hold link in the cart the operation is moved to the main window and the Cart window closes. Since the holdSel() function doesn't require interaction with template variables I have moved it to basket.js along with the described changes. To test, put items in your Cart and open it. Select items to place on hold and click the "Place hold" link. The cart should close, and the items you selected should appear on the place hold screen in the main window. --- koha-tmpl/opac-tmpl/prog/en/js/basket.js | 10 ++++++++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js index a3675ad..63743bb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/basket.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/basket.js @@ -381,6 +381,16 @@ function showLess() { document.location = loc; } +function holdSel() { + var items = document.getElementById('records').value; + if (items) { + parent.opener.document.location = "/cgi-bin/koha/opac-reserve.pl?biblionumbers=" + items; + window.close(); + } else { + alert(MSG_NO_RECORD_SELECTED); + } +} + function updateBasket(updated_value,target) { if(target){ target.$('#basketcount').html(""+updated_value+""); diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt index 35fe06a..0c3811a 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt @@ -100,16 +100,6 @@ function tagAdded() { }); [% END %][% END %][% END %] }); -[% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %] - function holdSel() { - var items = document.getElementById('records').value; - if (items) { - document.location = "/cgi-bin/koha/opac-reserve.pl?biblionumbers=" + items; - } else { - alert(MSG_NO_RECORD_SELECTED); - } - } -[% END %][% END %] //]]> [% END %] -- 1.7.9.5 From oleonard at myacpl.org Wed Dec 12 18:05:26 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 12 Dec 2012 12:05:26 -0500 Subject: [Koha-patches] [PATCH] Bug 9276 - Display of biblio-level auth vals on OPAC search broken Message-ID: <1355331926-4513-1-git-send-email-oleonard@myacpl.org> If you have your MARC framework configured to link a biblio-level field with an authorized value, and that value is linked to an image, and the AuthorisedValueImages system preference is turned on, the OPAC is supposed to display that image in search results much like item type images are displayed if item-level itemtypes are enabled. The switch to Template::Toolkit broke this feature with a variable scope error. This patch corrects the variable scope of the sytem preference check and adds a check for the existence of the image so that the template doesn't try to display broken images. To test: 1. Turn on the AuthorisedValueImages system preference. 2. If necessary, create or configure an authorized value with images. 3. Configure a MARC framework to link a field to the authorized value. I chose an arbitrary field, 942e. 4. Edit a bibliographic record and set a value for the MARC field you configured. 5. Make sure Zebra has reindexed, and perform an OPAC search which will include the record you edited. With AuthorisedValueImages ON, you should see the correct authorized value image. 6. With AuthorisedValueImages OFF, you should see no image. 7. Turn AuthorisedValueImages back on. Edit the authorized value again and configure it with no image. Perform your search again. You should see no image. --- .../opac-tmpl/prog/en/modules/opac-results.tt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index 2e3ad22..89cc5db 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -445,10 +445,12 @@ $(document).ready(function(){ [% END %] [% END %] - [% IF ( SEARCH_RESULT.AuthorisedValueImages ) %] + [% IF ( AuthorisedValueImages ) %] [% FOREACH authorised_value_image IN SEARCH_RESULT.authorised_value_images %] - [% authorised_value_image.label %] + [% IF ( authorised_value_image.imageurl ) %] + [% authorised_value_image.label %] + [% END %] [% END %] [% END %] -- 1.7.9.5 From oleonard at myacpl.org Wed Dec 12 18:56:52 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 12 Dec 2012 12:56:52 -0500 Subject: [Koha-patches] [PATCH] Bug 9265 - Switch to HTML5 doctype in OPAC and staff client Message-ID: <1355335012-5592-1-git-send-email-oleonard@myacpl.org> This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5 validator seems to be significantly different than the XHTML one, so I'm seeing lots of new errors. This patch includes corrections for one: Deprecation of the "language" attribute of [% END %] - [% IF ( virtualshelves || intranetbookbag ) %] - + [% END %] [% IF LocalCoverImages %] - - + - - + [% END %] - + - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index d22cf5f..114a422 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -3,7 +3,7 @@ [% INCLUDE "doc-head-close.inc" %] - - - + - + [% IF ( OPACAmazonCoverImages ) %] - - + [% END %] [% IF ( SyndeticsCoverImages ) %] - - [% END %] + [% END %] -[% IF ( opacbookbag ) %] - -[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] +[% IF ( opacbookbag ) %] +[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - - + [% END %] [% IF OpenLibraryCovers %] - - + - + [% END %] -[% IF ( BakerTaylorEnabled ) %] - + - + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 4f0e540..8eadd4f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -31,7 +31,7 @@ - + [% IF ( OPACAmazonCoverImages ) %] [% END %] [% IF ( SyndeticsCoverImages ) %] - - [% END %] + [% END %] -[% IF ( opacbookbag ) %] - -[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] +[% IF ( opacbookbag ) %] +[% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %][% END %][% ELSE %][% END %] [% IF ( GoogleJackets ) %] - - + [% END %] [% IF OpenLibraryCovers %] - - + - + [% END %] -[% IF ( BakerTaylorEnabled ) %] - + - + [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc index 1aea582..970324c 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc @@ -1,5 +1,4 @@ - -[% IF ( bidi ) %][% ELSE %][% END %] + +[% IF ( bidi ) %][% ELSE %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index 3f661ad..61e64f6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -170,12 +170,12 @@ </div> <div id="breadcrumbs" class="yui-g"> [% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %] -<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> +<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html |url %][% limit_cgi |html | url %]&count=[% countrss |html %]&sort_by=acqdate_dsc&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" class="rsssearchicon"/></a> [% ELSE %] <strong>No results found!</strong> <p> [% IF ( searchdesc ) %] - No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> + No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html | url %][% limit_cgi | html | url %]&format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a> [% ELSE %] You did not specify any search criteria. [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt index 5be6ac3..0dc3fa7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tt @@ -1,6 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › ISBD view [% INCLUDE 'doc-head-close.inc' %] -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ YAHOO.util.Event.onContentReady("furtherm", function () { $("#furtherm").css("display","block").css("visibility","hidden"); diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 1753cce..8c0c231 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -8,7 +8,9 @@ <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tools.min.js"></script> [% IF ( SocialNetworks ) %] <script type="text/javascript" src="https://apis.google.com/js/plusone.js"> + //<![CDATA[ {lang: '[% lang %]'} + //]]> </script> <script type="text/javascript">!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> [% END %] @@ -16,7 +18,7 @@ <link rel="stylesheet" type="text/css" href="/opac-tmpl/prog/en/css/jquery.rating.css" />[% END %] [% IF ( OpacHighlightedWords ) %]<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.highlight-3.js"></script>[% END %] -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ [% IF ( OpacBrowseResults && busc ) %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt index 8096baf..4ed38fe 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -318,7 +318,7 @@ [% IF ( reserve_in_future ) %] <td class="reserve_date"> <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from" size="10" class="datepickerfrom"/> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> //<![CDATA[ $("#reserve_date_[% bibitemloo.biblionumber %]").attr( 'readonly', 'readonly' ); //]]> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt index 5ab225d..072b2fd 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt @@ -3,7 +3,7 @@ <style type="text/css"> #custom-doc { width:37.08em;*width:36.16em;min-width:485px; margin:1em auto; text-align:left; } </style> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ $(document).ready(function() { var inject_old = function(comment) { diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt index 3bfa668..6ef3578 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tt @@ -2,7 +2,7 @@ [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ var MSG_CONFIRM_DELETE_HISTORY = _("Are you sure you want to delete your search history?"); $(document).ready(function() { diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt index 3c62e55..1ac9598 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script> <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script type="text/JavaScript" language="JavaScript"> +<script type="text/javascript"> //<![CDATA[ $.tablesorter.addParser({ id: 'articles', diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt index b9ef41d..460ce93 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Most popular titles [% INCLUDE 'doc-head-close.inc' %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> //<![CDATA[ $.tablesorter.addParser({ id: 'articles', -- 1.7.9.5 From oleonard at myacpl.org Wed Dec 12 21:51:46 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Wed, 12 Dec 2012 15:51:46 -0500 Subject: [Koha-patches] [PATCH] Bug 9278 - Remove unused OPAC CSS file sanop.css Message-ID: <1355345506-8855-1-git-send-email-oleonard@myacpl.org> This patch removes an unused CSS file, sanop.css, included in both OPAC themes even though it is referenced by neither. To test, apply the patch and listen for the unhappy protestations of libraries whose OPACs now look different. If there are none, the patch works. --- koha-tmpl/opac-tmpl/ccsr/en/css/sanop.css | 2013 ----------------------------- koha-tmpl/opac-tmpl/prog/en/css/sanop.css | 2013 ----------------------------- 2 files changed, 4026 deletions(-) delete mode 100644 koha-tmpl/opac-tmpl/ccsr/en/css/sanop.css delete mode 100644 koha-tmpl/opac-tmpl/prog/en/css/sanop.css diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/sanop.css b/koha-tmpl/opac-tmpl/ccsr/en/css/sanop.css deleted file mode 100644 index 7ed0a67..0000000 --- a/koha-tmpl/opac-tmpl/ccsr/en/css/sanop.css +++ /dev/null @@ -1,2013 +0,0 @@ - -body #main { - margin-left : 2%; - background-color: #eeeeee; - -} - -/* TWO COLUMNS, RIGHT SIDEBAR */ - - -body#withsidebar #main { - float: left; - margin-left: 1%; - width: 58%; - } - -html body#withsidebar #main { - margin-left: .5%; - } - -body#withsidebar #sidebar - { - float: left; - margin-top : 2.4em; - width: 39%; -} - -/* THREE COLUMNS */ - -body#tricolumn #main_wrapper { - float: left; - width: 100%; -} - -body#tricolumn #main - { - margin: 0 150px 0 175px; - } - -body#tricolumn #nav - { - float: left; - margin-left: -100%; - width: 175px; - } -body#tricolumn #sidebar - { - float: left; - margin-left: -150px; - width: 150px; - } - -/* TWO COLUMNS LEFT NAVIGATION */ - -body#withnav #main_wrapper - { - float: left; - width: 100%; - } - -body#withnav #main - { - margin: 0 0 0 175px; - } - -body#withnav #nav - { - float: left; - margin-left: -100%; - width: 175px; - } - -body#withnav #main .content-block { - padding-left : 10px; -} - -/* END TWO COLUMNS RIGHT NAVIGATION */ - -a { - font-weight: bold; -} - -a:link, a:visited, a:active { - text-decoration : underline; - color :navy; -} - -a:link.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:link.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; - -} - -a:visited.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:visited.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:hover.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:hover.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; - -} - -a:active.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:active.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a.help { - padding: 3px; - text-decoration: none; -} - -a.title { - font-size: 1.2em; - font-style: normal; - font-weight: bold; -} - -body { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size: 73%; - margin: 0; - padding: 0; - background-color : #eeeeee; -} - -input, select, th, td { - font-size:1em -} - -caption { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-size : 1.3em; - font-weight: bold; - margin: 0; - padding: 5px 0 3px 0; - text-align: left; -} - -div.bookcover { - float: right; -} - -div.details td.details { - text-align: left; -} - -div.details ul { - list-style-type: circle; - margin-left: 0; - text-align: left; -} - -div.error { - padding: 3px 10px 3px 10px; - width: 75%; -} - -div.error li { - margin-bottom: .5em; -} - -div.form, div.details { - margin: 0 auto; - padding: 0 0 0 6px; -} - -div.notes { - text-align: left; -} - -div.sidebar-box+div.sidebar-box { - margin-top: 5px; -} - -div.tab { - display: block; - margin-right: 0px; - width: 100%; -} - -div.tab p { - margin: 0; - padding: 3px 0; -} - -div.tab p.MARCtag { - clear: both; - font-weight: bold; /* style for tag definition (700 - Statement of responsability) */ - margin: 0; - padding: 2px; -} - -div.tab table { -} - -div.tabbloc { - font-family: Arial, Helvetica, sans-serif; -} - -div.table { - width: 95%; -} - -dl.details dt { - font-weight: bold; - margin: .5em 0; -} - -dl.details dd { - margin-left: 1em; -} - -dl.details ul { - padding: 0; - margin-left: 1em; -} - -dl.details ul p { - margin-left : 0; -} - -em.new { - font-style: normal; - font-weight: bold; -} - -form { - display: inline; - margin: 0; - padding: 0; -} - -h1 { - font-size: 1.8em; - padding: 5px 0 3px 0; -} - -h1,h2,h3,h4,h5,h6 { - font-family: arial, geneva, helvetica, sans-serif; - margin: 0; -} - -h1.logo { - display: inline; - margin: 10px 0 0 10px; - -} - -h1.title { - font-style: italic; - padding: 5px 0 3px 0; - color: navy; -} - -h2 { - font-size: 1.6em; - padding: 5px 0 3px 0; - -} - -h2#libraryname { - padding-left : 5px; -} - -h3 { - font-size: 1.4em; - padding: 5px 0 3px 0; -} - -h3.author { - padding: 0 0 3px 15px; -} - -h3+p { - margin: .4em 0 .4em 0; -} - -h4 { - font-size: 1.3em; - padding: 5px 0 3px 0; -} - -h5 { - font-size: 1.2em; - margin: 0; - padding: 10px 0 2px 0; -} - -h5+p { - margin-top: 0; - padding-top: 0; -} - -h6 { - font-size: 1.1em; -} - -input.add, a.add { - background-image: url(../images/add.gif); -} - -input.addchecked, a.addchecked { - background-image: url(../images/addtobasket.gif); -} - -input.back, a.back { - background-image: url(../images/back.gif); -} - -input.brief, a.brief { - background-image: url(../images/brief.gif); -} - -input.cancel { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px; -} - -input.cart, a.cart { - background-image: url(../images/cart.gif); -} - -input.clearall, a.clearall { - background-image: url(../images/clearbasket.gif); -} - -input.close, a.close { - background-image: url(../images/close.gif); -} - -input.delete, a.delete { - background-image: url(../images/delete.gif); -} - -input.detail, a.detail { - background-image: url(../images/detail.gif); -} - -input.edit, a.edit { - background-image: url(../images/edit.gif); -} - -input.icon { - background-position: left; - background-repeat: no-repeat; - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px 2px 2px 22px; -} - -input.isbd, a.isbd { - background-image: url(../images/isbd.gif); -} - -input.print, a.print { - background-image: url(../images/print2.gif); -} - -input.remove, a.remove { - background-image: url(../images/remove.gif); -} - -input.reserve, a.reserve { - background-image: url(../images/placereserve.gif); -} - -input.send, a.send { - background-image: url(../images/send.gif); -} - -input.shelf, a.shelf { - background-image: url(../images/addtoshelf.gif); -} - -input.trash, a.trash { - background-image: url(../images/trash.gif); -} - -p { - padding: 0 10px 0 10px; -} - -p.error, div.error { - font-weight: normal; - margin: auto; - padding: 5px 20px 5px 20px; -} - -p.error+p.error, div.error+div.error { - margin-top: 5px; -} - -p+h3 { - margin-top: .6em; -} - -p+h5 { - margin: 0; - padding: 3px 0 2px 0; -} - -span.itemicon { - float : left; - font-size: .9em; - margin: 2px; - white-space: nowrap; -} - -span.print { - font-size: .7em; - font-weight: normal; - padding-left: .7em; -} - -table { - border-collapse: collapse; - margin: 5px 0 5px 0; - padding: 0; -} - -*html td, *html th { - font-size : .8em; -} - -td { - padding: 3px; -} - -td.input, div.form td, div.details td { - border-left: 0; - border-right: 0; - padding: 2px 2px 2px 4px; - text-align: right; -} - -td.credit { - text-align: right; -} - -td.debit { - text-align: right; -} - -td.sum, th.sum { - text-align: right; -} - -td.sum { - font-weight: bold; -} - -td.label { - font-weight: bold; - line-height: 1.5em; - padding: 4px; -} - -td.label, div.form th, div.details th { - border-right: 0; - border-top: 0; - font-weight: bold; - padding: 2px 2px 2px 4px; - text-align: left; - vertical-align: top; -} - -td.search-options select { -} - -td:last-child { - padding: 3px; -} - -th { - font-weight: bold; - padding: 2px; -} - -th a { - font-weight: bold; - text-decoration: none; -} - -th:last-child { - font-weight: bold; - padding: 2px; -} - -th[scope="row"] { - font-weight: normal; - text-align: right; -} - -ul#facets { - margin: 3px; -} - -#nav ul#facets { - margin : 0; - padding : 0; -} - -#nav ul#facets li { - font-weight: bold; - text-align: left; -} - -#nav ul#facets li#branch_facet, #nav ul#facets li#subject_facet, #nav ul#facets li#series_facet, #nav ul#facets li#author_facet { -} - -#nav ul#facets ul li { - border: 0; - font-size: .95em; - font-weight: normal; - padding: 2px; - text-align: left; -} - -#nav ul#facets ul li a { - font-weight: normal; - text-decoration: underline; -} - -#nav ul#facets ul li.showmore { - text-align: center; -} - -#nav ul#facets ul li.showmore a { - font-weight: bold; - text-decoration: none; -} - -/* Tabs */ -ul.link-tabs { - list-style-type: none; - margin: 9px 0 -2px 5px; - padding: 0; -} - -ul.link-tabs li { - display: inline; - padding: 0px; -} - -ul.link-tabs li a { - font-weight: bold; - padding: 2px 4px 2px 4px; - text-decoration: none; -} - -ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a { - padding: 2px 4px 3px 4px; -} - -ul.link-tabs li.off a { -} - -ul.link-tabs li.off a:hover { - padding: 2px 3px 2px 4px; -} - -ul.link-tabs li.on a { -} - -.clear { - clear: both; - line-height: .1em; -} - -.content-block { - padding: 5px; -} - -#home { - text-align : center; -} - -#home #searchform input.submit { - font-size : 1.3em; -} - -div#advanced-search p { - margin: .4em; - -} - -div#advanced-search fieldset { - /*margin-left : -1em;*/ - margin-bottom: .3em; - background-color : #eeeeee; - -} - -div#advanced-search fieldset p { - margin-left : 1em; - white-space: nowrap; - - -} - -table.itemtypes { - border-collapse: separate; - border-spacing: 3px; - display: block; - padding: 0; - margin: 0; -} - -div#advanced-search legend, div#sidebar legend { - font-weight: bold; -} - -div#advanced-search label { - -} - -.count { - font-weight: normal; -} - -.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -.detail-sidebar { - float: right; - padding: 5px; - margin-left : 15px; - margin-right : 5px; - text-align: center; - width : 25%; -} - -.detail-sidebar .further { - float: none; - text-align: left; - width : 90%; -} - -.further { - margin: 5px; - text-align: left; - width : 90%; -} - -.ex { - font-family: "Courier New", Courier, monospace; -} - -.further h4 { - padding: 2px; -} - -.further li { - padding: 2px 0; -} - -.further ul, .further li { - list-style: none; - margin: .5em 0 .7em .4em; - padding: 0; -} - -.inline { - display: inline; -} - -.item-datedue { - font-style: italic; -} - -.item-details { - display: block; - margin: 0 0 0 25px; -} - -.item-reserved, .item-notforloan, .item-lost, .item-cancelled, .item-damaged, .item-reserved { - display: block; -} - -.labelsubfield { - clear: both; /* style for each subfield (like : a Publication year), just before the biblio subfield */ - float: left; - font-weight: bold; - margin-left: 30px; - width: 12em; -} - -.left { - float: left; -} - -.loggedin { - font-weight: bold; -} - -.login-note { - width: 35%; -} - -.menu { - line-height: 3em; - font-size: 1.2em; - margin: 0; - padding: 5px; -} - -.menu a.logout { - font-weight: bold; - padding: 3px 15px 3px 15px; - text-decoration: none; -} - -.menu a:link, #members a:link { - padding: 2px; -} - -.menu a:visited, #members a:visited { - padding: 2px; -} - -.menu a:hover, #members a:hover { - padding: 2px; -} - -.menu a:active, #members a:active { - padding: 2px; -} - -.menu input { -} - -.menu label { - font-weight: bold; -} - -.menu p { - margin: 0; - padding: 0; -} - -.menu p+p { - margin-top: 5px; -} - -.note { - margin: 10px auto; - padding: 4px 4px 4px 4px; - width: 35%; -} - -.opac-detail { - padding: 4px; -} - -.opac-detail dd { - display: block; - line-height: 1.5em; - padding: 4px; - text-align: right; -} - -.operations { - margin-top: 7px; - padding: 0 10px; - text-align: center; - width: 100%; -} - -.operations img { - padding: 5px; -} - -.operations li { - list-style-type: none; - margin: 0; - padding-bottom: 2px; -} - -.operations li a, .operations li a:visited { - background-position: top left; - background-repeat: no-repeat; - border-style: outset; - display: block; - padding: 3px 3px 3px 26px; - text-decoration: none; -} - -.searchresults a.reserve, .searchresults a.reserve:visited { - background-position: top left; - background-repeat: no-repeat;/* - border-style: outset;*/ - float: right; - padding: 2px 3px 2px 26px; - /*text-decoration: none;*/ -} - -.operations li a:active { - border-style: inset; -} - -.operations ul { - margin: 0; - padding: 0; - width: 90%; -} - -.overdue { - font-weight: bold; -} - -.pages { - line-height : 1.8em; - text-align: center; -} - -.rejected { - text-decoration: line-through; -} - -.right { - float: right; -} - -.search-main { - float: left; - width: 65%; -} - -.searchresults input, .searchresults label, .searchresults select { - font-size: .8em; -} - -.searchresults p { - margin: 0; - padding: 0; - padding-top : .6em; -} - -.searchresults p img { - vertical-align: middle; -} - -.searchresults table td { - vertical-align: top; -} - -p.searchresults { - margin-top : -5px; - text-align : right; - vertical-align : middle; - padding-bottom : 3px; -} - -.selected { - text-decoration: none; -} - -.sidebar-box { - margin-bottom: 0; -} - -.sidebar-box h3, .sidebar-box h4 { - margin-left: 10px; -} - -.sidebar-box p { - margin: 3px 10px; - padding: 0; -} - -.submit { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px; -} - -.term { - font-weight: bold; -} - -.thumbnail { - border: 0; - float: left; - margin: 0 5px 5px 0; -} - -.title { - font-style: italic; - font-weight: bold; -} - -#sidebar .content-block { - margin : 0 10px 0 0; -} - -form#auth h3 { - font-size : 1.1em; -} - -#footer { - clear: both; - padding: 10px; - text-align: center; -} - -#corner { - position: absolute; - top: 10px; - right: 5px; -} - -#corner a.cart { - background-image : url(../images/cart-small.gif); - background-position: left; - background-repeat : no-repeat; - padding: 0 15px; - text-decoration: none; -} - -#languages { - display: inline; -} - -#languages ul { - display : inline; - list-style: none; - margin: 0; - padding : 0; -} - -#languages ul li { - display: inline; - font-family: Arial, Helvetica, sans-serif; - font-size: .9em; -} - -#languages ul li a { - font-weight: normal; - padding: 0 3px; - text-decoration: none; -} - -#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label { - font-weight: bold; - text-align: right; -} - -#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity { - margin: 5px; - width: 96%; -} - -/*#main { - margin-left: 20%; - margin-right: 0; - padding: 0; - position: relative; -}*/ - -#masthead { - margin: 0; - margin-bottom : 1em; - padding: 0; - text-align:center; - -} - -#members { - font-size: .8em; - font-weight: bold; - padding: 4px 0 4px 0; -} - -#members a.card { - background-image: url(../images/card.gif); - background-position: left; - background-repeat: no-repeat; - display: block; - padding-left: 39px; -} - -#members a.logout { - font-weight: bold; - padding: 0 .3em 0 .3em; - text-decoration: none; -} - -#members li { - display: inline; - list-style: none; - margin: 0; -} - -#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members { - padding : 4px; -} - -#members ul li:last-child { -} - -#members ul li a:hover { -} - -#members ul { - margin: 0; - padding: 0; - text-align: right; -} - -/*#nav { - float: left; - margin: 0; - padding: 0; - width: 20%; -}*/ - -#nav a { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - text-decoration: none; -} - -#nav h6 { - padding: 3px; - text-align: center; -} - -#nav li ul li { - font-family: Arial, Geneva, Helvetica, sans-serif; - list-style: none; - margin: 0; - padding: 5px 3px 5px 3px; - text-align: right; -} - -#nav li ul li a { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - text-decoration: none; -} - -#nav ul { - margin: 0; - padding: 0; -} - -#nav ul li { - font-family: Arial, Geneva, Helvetica, sans-serif; - list-style: none; - margin: 0; - padding: 3px 8px 3px 3px; - text-align: right; -} - -#nav ul li+li { - margin: 0; -} - -#power_formButton, #proximity_formButton { -} - -#results, .results { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - margin: 0; - padding: 7px 0 10px 0; -} - -#search-footer { - margin: auto; - text-align: center; -} - -#search-footer a { - margin: 3px 5px 3px 5px; - padding: 2px 5px; - text-decoration: none; -} - -#searchform input.submit { - font-size: .8em; -} - -#search-sidebar { - float: right; - margin: 10px; - padding: 3px; - width: 30%; -} - -#search-sidebar .sidebar-box label { - display: block; - text-align: left; -} - -/*#sidebar { - float: right; - margin: 20px; - padding: 5px; - width: 20%; -}*/ - -#sidebar .submit { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - padding: 2px; - font-size: 1em; -} - -#sidebar h3 { - font-family: Arial, Geneva, Helvetica, sans-serif; - margin: 0; - padding: 5px 0 1px 0; -} - -#sort { - margin: .3em; -} - -#sort, #sort select, #sort input { -} - -#starFull { - background: url(../images/bluestars.png) top left no-repeat; - height: 25px; - margin: 0; - padding: 0; -} - -#starMT { - background: url(../images/emptystars.png) top left no-repeat; - height: 25px; - margin: 0 3px 0 30px; - padding: 0; - position: relative; - width: 100px; -} - -#window { - margin-left: 2%; - margin-right: 2%; - margin-top: 2%; - padding: 10px; -} - -#window .class { - display: block; - font-weight: bold; - padding: 0 0 5px 3px; -} - -#window div.menu { - margin: 0; - -} - -div#item-details { - margin-bottom : 1.5em; -} - -div#item-details img { - float : left; - padding : 1em; -} - -div#item-details p { - margin : .1em 0; - line-height : 1.6em; -} - -div#holdings table { - width : 100%; -} - -div#holdings td, div#holdings th { - padding : 5px; -} - -div#holdings, div#descriptions, div#reviews, div#serials, div#publicshelves, div#privateshelves, div#fines, div#waiting, div#overdues, div#issues, div#reserves { - margin-top : 4px; - padding : .7em; - width : 90%; -} - -#usermenu { - font-size: .9em; - font-weight: bold; - margin-top : -1.1em; - margin-bottom : 1em; - padding: 4px 0 4px 0; - - -} - -#usermenu li { - display: inline; - list-style: none; - margin: 0; -} - -#usermenu ul li a:link, #usermenu ul li a:visited, #usermenu ul li a:hover, #usermenu ul li a:active, #usermenu span.members { - padding : 4px; -} - -#usermenu ul li:last-child { -} - -#usermenu ul li a:hover { -} - -#usermenu ul { - margin: 0; - padding: 0; - text-align: right; -} - -table.featured-item { - border-collapse : separate; - border-spacing: 9px; - margin : 5px; - text-align : center; -} - -table.featured-item td { - vertical-align : top; -} - -table.featured-item a img { - margin : auto; -} - -table.featured-item a.title { - display : block; - font-size : 1em; - margin-bottom : .4em; -} - -table.featured-item .author { - display : block; - font-size : .95em; - margin-bottom : .2em; -} - -table.featured-item .publisher { - display : block; - font-size : .8em; -} - -/* COLORS, BACKGROUNDS, AND BORDERS */ - -a { - color: #006699; -} - -a:link.current { - background-color: transparent; - color: #3366CC; -} - -a:link.nav { - background-color: #EFF1DC; - border: 1px solid #CCCC99; - color: #3366CC; -} - -a:visited { - color: #006699; -} - -a:visited.current { - background-color: transparent; - color: #3366CC; -} - -a:visited.nav { - background-color: #EFF1DC; - border: 1px solid #CCCC99; - color: #3366CC; -} - -a:hover { - color: orange; -} - -a:hover.current { - background-color: #CCFF00; - color: #CC3333; -} - -a:hover.nav { - background-color: #FFFFCC; - border: 1px solid #CCCC99; - color: #CC3333; -} - -a:active { - color: #990033; -} - -a:active.current { - background-color: #99CC00; - color: #FFFF99; -} - -a:active.nav { - background-color: #FFFFCC; - border: 1px solid #CCCC99; - color: #D25500; -} - -a.reserve { - background-color: #006699; - color: White; -} - -body { - background-color: #eeeeee; -} - -body#withsidebar #main { - border: 0; - -} -ul { -background-color:#eeeeee; -text-align: left; -} - -caption { - color: #000066; -} - -div.error h3 { - color: #990000; -} - -div.form, div.details { - background-color: #ffffff; -} - -div.tab { - background-color: transparent; -} - -div.tab p { - border-bottom: 1px solid #FFFFFF; - border-top: 1px solid #D8DEB8; -} - -div.tabbloc { - background-color: transparent; -} - -div#advanced-search fieldset { - border-right : 1px none #999999; - border-top : 1px none #999999; - border-bottom : 1px none #999999; - border-left : 1px none #999999; -} - -div#advanced-search legend { - color : #003366; -} - -dl.details dt { - color: #000066; -} - -em.new { - color: #CC3333; -} - -h1,h2,h3,h4,h5,h6 { - color: navy; - background-color:navy; - color:white; -} - -h1.logo { - color: #D3DFAD; - -} - -h1#libraryname a { - color: #000066; - margin-left: .3em; - text-decoration: none; -} - -input.icon { - background-color: #6699CC; - border: 1px outset #666666; - color: #FFFFCC; -} - -p.availability { - color: #666666; - font-size: .9em; -} - -p.error, div.error { - background-color: #FFFFCC; - border: 1px dashed #CC6600; -} - -span.itemicon { - background-color : #F8F8EB; - border: 1px solid #D8DEB8; -} - -table { - background-color: #FFFFFF; -} - -table.itemtypes td { - background-color: #F8F8EB; - border: 1px solid #D8DEB8; -} - -td { - background-color: #FFFFFF; - border-bottom: 1px solid #DDDDDD; - border-right: 1px solid #DDDDDD; -} - -td.input, div.form td, div.details td { - border-bottom: 1px solid #CCCCCC; - border-left: 0; - border-right: 0; - color: #000000; -} - -td.credit { - color: #000066; -} - -td.debit { - color: #990000; -} - -td.sum, th.sum { -} - -td.sum { - background-color : #FFFFCC; -} - -td.label { - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #CCCCCC; - color: #000088; -} - -td.label, div.form th, div.details th { - background-color: #FFFFFF; - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #CCCCCC; - border-right: 0; - border-top: 0; - color: #000088; -} - -div.details { - padding: 5px; - -} - -div.details table, div.details td, div.details th { - border: 0; - border-bottom: 1px solid #DDDDDD; -} - -td.overdue { - color: #CC0000; -} - -td:last-child { - border-bottom: 1px solid #CCCCCC; - border-right: 0 solid #CCCCCC; -} - -th { - background-color: #EFF1DC; - border-bottom: 1px solid #CCCCCC; - border-right: 1px solid #CCCCCC; -} - -th:last-child { - background-color: #EFF1DC; - border-bottom: 1px solid #CCCCCC; - border-right: 0 solid #CCCCCC; -} - -th[scope="row"] { - background-color: #E7E7CA; -} - -tr.highlight { - background-color: #F8F8EB; -} - -tr.highlight th[scope="row"] { - background-color: #EEEEEE; -} - -tr.overdue td { - background-color: #FFDDDD; -} - -input.cancel { - background-color: #990033; - border: 1px outset #666666; - color: #FFFFCC; -} - -.available { - color : #006600; -} - -.content-block { - background-color: #FFFFFF; -} - -.current { - background-color: #FFFFFF; - color: #3366CC; -} - -.detail-sidebar { - background-color: #EEEEEB; -} - -.further { - background-color: #EEEEEB; - border: 2px solid #DDDED3; - color: #CCCC99; -} - -.further h4 { - background-color: #D8DEB8; -} - -.further li { -} - -.issued { - color: #999999; -} - -.labelsubfield { -} - -.loggedin { - color: #D8DEB8; -} - -.loggedinusername { - color: #666666; -} - -.marcsubfieldletter { - background-color: #EFF1DC; -} - -.marcsubfieldname { - background-color: #EFF1DC; -} - -.MARCtag { - background-color: #EEEEEE; - color: #000066; /* style for tag definition (700 - Statement of responsability) */ -} - -.menu { - background-image : url(../images/menu-background.gif); - background-repeat: repeat-x; - background-color: #6699CC; - border-top: 1px solid #335599; - border-bottom: 1px solid #335599; - color: #FFFFFF; - -} - -.menu a:link { - color : #FFFFCC; -} - -.menu a:visited { - color : #FFFFCC; -} - -.menu a:hover { - color : #FFFFFF; -} - -.menu a:active { - color : #FFFF99; -} - -#members a:link { - color: #0099CC; -} - -#members a:visited { - color: #0099CC; -} - -#members a:hover { - color: #990000; -} - -#members a:active { - color: #990000; -} - -.menu input.submit { - background-color : #6BA037; - color: #FFFFFF; -} - -.note { - background-color: #EEEEEB; - border-bottom: 1px solid #DDDED3; - border-left: 1px solid #DDDED3; - border-right: 1px solid #DDDED3; - border-top: 1px solid #DDDED3; -} - -.opac-detail { - background-color: #FFFFCC; -} - -.opac-detail dd { - border-bottom: 1px solid #E7E7CA; - color: #000000; -} - -.operations li a, .operations li a:visited { - background-color: #6699CC; - border: 2px solid #D8DEB8; - color: #FFFFCC; -} - -.operations li a:hover { - background-color: #0099FF; - color: #FFFF99; -} - -.operations li a:active { - background-color: #0099FF; - color: #FFFF99; -} - - -.item-reserved { - color : #009933; -} - -.item-datedue { - color: #999999; -} - -.item-notforloan, .item-lost, .item-cancelled, .item-damaged, .item-reserved { -} - -.searchresults td, .searchresults th, .searchresults table { - border: 0; -} - -.searchresults tr { - border-bottom : 1px solid #CCCCCC; -} - -.searchresults table { - border-top : 0px solid #CCCCCC; -} - -p.searchresults { - background-color : #EFF1DC; -} - -.searchresults a.reserve { - background-color : transparent; - color : #006699;/* - background-color : #6699CC; - border: 1px outset #666666; - color : White;*/ -} - -.sidebar-box { - border: 1px dashed #CCCCCC; -} - -.subfield { - background-color: #EFF1DC; -} - -.subfieldvalue { - background-color: #FFFFFF; -} - -.submit { - background-color: #EEC95A; - border: 3px outset #666666; - color: #FFFFFF; -} - -.term { - background-color: #FFFFCC; - color: #990000; -} - -.unavailable { - color: #990033; -} - -#footer { - border-top: 1px solid #EEEEEE; -} - -#languages ul li a { - border: 1px solid #D8DEB8; -} - -#languages ul li a:hover { - background-color: #FFFFCC; -} - -#main { - background-color: transparent;/* - border-top: 1px solid #EEEEEE;*/ -} - -#masthead { - background-color: #FFFFFF;/* - border-bottom: 1px solid #EEEEEE;*/ -} - -#members { - background-image : url(../images/member-menu-background.gif); - background-repeat: repeat-x; - border-top: 1px solid #9999CC; - border-bottom : 1px solid #9999CC; - background-color: #AFBCCF; - color: #000066; -} - -#members ul li a:link, #members ul li a:visited, #members span.members { - background-image : url(../images/member-menu-background-link.gif); - background-repeat: repeat-x; - border-left: 1px solid #9999CC; - color: #006699; -} - -#members ul li:last-child a { - border-right : 1px solid #9999CC; -} - -#members ul li a:hover, #members ul li a:active { - background-image : url(../images/member-menu-background-hover.gif); - background-repeat: repeat-x; -} - -#members a { - text-decoration: none; -} - -#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active { - background-image : url(../images/member-menu-background-logout.gif); - background-repeat: repeat-x; - color: #000000; -} - -#members a:hover.logout { - background-image : url(../images/member-menu-background-logout-hover.gif); - background-repeat: repeat-x; - color: #000000; -} - -#nav { - /*background-color: #EFF1DC;*/ - border : 1px solid #EFF1DC; - -} - -#nav h6 { - background-color: #E7E7CA; - line-height : 1.8em; - margin-left: -1px; - margin-top : -1px; - margin-right : -1px; -} - -#nav li ul li {/* - background-color: #E7E7CA;*/ - border-bottom: 0 solid #D8DEB8; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; - border-top: 0 solid #FFFFCC; -} - -#nav li ul li a { - color: #0000FF; -} - -#nav li ul li a:link { - color: #335599; -} - -#nav li ul li a:visited { - color: #335599; -} - -#nav li ul li a:hover { - color: #CC3333; -} - -#nav ul li { - /* background-color: #EFF1DC; */ - border-bottom: 0px solid #CCCC99; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; - border-top: 0 solid #FFFFCC; -} - -#nav ul li+li { - border-bottom: 0px solid #CCCC99; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; -} - -#results, .results { - color: #000066; -} - -#search-sidebar { - background-color: #F8F8EB; -} - -#sidebar { - /*background-color: #F8F8EB; - border: 1px dashed #666666;*/ -} - -#sidebar .content-block { - background-color : #EEEEEE; -} - -#sidebar fieldset { - background-color: #F9F9FF; -} - -#sidebar legend { - color : #003366; -} - -#sidebar .submit { -/* background-color: #EEC95A; */ - color: #FFFFFF; -} - -#sidebar h3 { - color: #000066; -} - -#window { - background-color: #E7E7CA; - border-left: 1px solid #CCCC99; -} -ul.link-tabs { -} - -ul.link-tabs li { -} - -ul.link-tabs li a { - border-top: 1px solid #DDDDDD; - border-left : 1px solid #DDDDDD; - border-right : 1px solid #666666; -} - -ul.link-tabs li.on a { - background-color: #FFFFFF; - border-bottom: 1px solid #FFFFFF; -} - -ul.link-tabs li.off a { - background-color: #EEEEEB; - border-bottom: 1px solid #DDDDDD; -} - -ul.link-tabs li.off a:hover { - background-color: #FFFFEC; - border-top: 1px solid #BEBF84; - border-left : 1px solid #BEBF84; - border-right : 2px solid #333333; -} - -ul.link-tabs li a.debit { - background-color : #FFFF99; - color : #990033; -} - -div#holdings, div#descriptions, div#reviews, div#serials, div#publicshelves, div#privateshelves, div#fines, div#waiting, div#overdues, div#issues, div#reserves { - border : 1px solid #DDDDDD; -} - -div#holdings table { - border-top : 1px solid #DDDDDD; - border-right : 1px solid #DDDDDD; -} - -div#holdings td, div#holdings th { - border-left : 1px solid #DDDDDD; - border-bottom : 1px solid #DDDDDD; -} - -#usermenu { - background-image : url(../images/usermenu-background.gif); - background-repeat: repeat-x; - background-color: #EEEEEB; - border-top: 1px solid #EEEEEE; - border-bottom: 1px solid #335599; - color: #000000; -} - -#usermenu ul li a:link, #usermenu ul li a:visited { - background-image : url(../images/usermenu-background.gif); - background-repeat: repeat-x; - border-left: 1px solid #9999CC; - color: #006699; -} - -#usermenu ul li:last-child a { - border-right : 1px solid #9999CC; -} - -#usermenu ul li a:hover, #usermenu ul li a:active { - background-image : url(../images/usermenu-background-hover.gif); - background-repeat: repeat-x; -} - -#usermenu a { - text-decoration: none; -} - -table.featured-item { - border : 0; -} - -table.featured-item td { - border : 1px solid #CCCCCC; -} - -table.featured-item a img { -} - -table.featured-item a.title { -} - -table.featured-item .author { -} - -table.featured-item .publisher { -} -h1{ -background-color: #eeeeee; -color: navy; -background-image: url(./acceuil.jpg); -background-repeat:no-repeat; -} -h1.authority -{ -background-image:none; - -} \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sanop.css b/koha-tmpl/opac-tmpl/prog/en/css/sanop.css deleted file mode 100644 index 610b00e..0000000 --- a/koha-tmpl/opac-tmpl/prog/en/css/sanop.css +++ /dev/null @@ -1,2013 +0,0 @@ - -body #main { - margin-left : 2%; - background-color: #eeeeee; - -} - -/* TWO COLUMNS, RIGHT SIDEBAR */ - - -body#withsidebar #main { - float: left; - margin-left: 1%; - width: 58%; - } - -html body#withsidebar #main { - margin-left: .5%; - } - -body#withsidebar #sidebar - { - float: left; - margin-top : 2.4em; - width: 39%; -} - -/* THREE COLUMNS */ - -body#tricolumn #main_wrapper { - float: left; - width: 100%; -} - -body#tricolumn #main - { - margin: 0 150px 0 175px; - } - -body#tricolumn #nav - { - float: left; - margin-left: -100%; - width: 175px; - } -body#tricolumn #sidebar - { - float: left; - margin-left: -150px; - width: 150px; - } - -/* TWO COLUMNS LEFT NAVIGATION */ - -body#withnav #main_wrapper - { - float: left; - width: 100%; - } - -body#withnav #main - { - margin: 0 0 0 175px; - } - -body#withnav #nav - { - float: left; - margin-left: -100%; - width: 175px; - } - -body#withnav #main .content-block { - padding-left : 10px; -} - -/* END TWO COLUMNS RIGHT NAVIGATION */ - -a { - font-weight: bold; -} - -a:link, a:visited, a:active { - text-decoration : underline; - color :navy; -} - -a:link.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:link.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; - -} - -a:visited.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:visited.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:hover.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:hover.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; - -} - -a:active.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a:active.nav { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -a.help { - padding: 3px; - text-decoration: none; -} - -a.title { - font-size: 1.2em; - font-style: normal; - font-weight: bold; -} - -body { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size: 73%; - margin: 0; - padding: 0; - background-color : #eeeeee; -} - -input, select, th, td { - font-size:1em -} - -caption { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-size : 1.3em; - font-weight: bold; - margin: 0; - padding: 5px 0 3px 0; - text-align: left; -} - -div.bookcover { - float: right; -} - -div.details td.details { - text-align: left; -} - -div.details ul { - list-style-type: circle; - margin-left: 0; - text-align: left; -} - -div.error { - padding: 3px 10px 3px 10px; - width: 75%; -} - -div.error li { - margin-bottom: .5em; -} - -div.form, div.details { - margin: 0 auto; - padding: 0 0 0 6px; -} - -div.notes { - text-align: left; -} - -div.sidebar-box+div.sidebar-box { - margin-top: 5px; -} - -div.tab { - display: block; - margin-right: 0px; - width: 100%; -} - -div.tab p { - margin: 0; - padding: 3px 0; -} - -div.tab p.MARCtag { - clear: both; - font-weight: bold; /* style for tag definition (700 - Statement of responsability) */ - margin: 0; - padding: 2px; -} - -div.tab table { -} - -div.tabbloc { - font-family: Arial, Helvetica, sans-serif; -} - -div.table { - width: 95%; -} - -dl.details dt { - font-weight: bold; - margin: .5em 0; -} - -dl.details dd { - margin-left: 1em; -} - -dl.details ul { - padding: 0; - margin-left: 1em; -} - -dl.details ul p { - margin-left : 0; -} - -em.new { - font-style: normal; - font-weight: bold; -} - -form { - display: inline; - margin: 0; - padding: 0; -} - -h1 { - font-size: 1.8em; - padding: 5px 0 3px 0; -} - -h1,h2,h3,h4,h5,h6 { - font-family: arial, geneva, helvetica, sans-serif; - margin: 0; -} - -h1.logo { - display: inline; - margin: 10px 0 0 10px; - -} - -h1.title { - font-style: italic; - padding: 5px 0 3px 0; - color: navy; -} - -h2 { - font-size: 1.6em; - padding: 5px 0 3px 0; - -} - -h2#libraryname { - padding-left : 5px; -} - -h3 { - font-size: 1.4em; - padding: 5px 0 3px 0; -} - -h3.author { - padding: 0 0 3px 15px; -} - -h3+p { - margin: .4em 0 .4em 0; -} - -h4 { - font-size: 1.3em; - padding: 5px 0 3px 0; -} - -h5 { - font-size: 1.2em; - margin: 0; - padding: 10px 0 2px 0; -} - -h5+p { - margin-top: 0; - padding-top: 0; -} - -h6 { - font-size: 1.1em; -} - -input.add, a.add { - background-image: url(../images/add.gif); -} - -input.addchecked, a.addchecked { - background-image: url(../images/addtobasket.gif); -} - -input.back, a.back { - background-image: url(../images/back.gif); -} - -input.brief, a.brief { - background-image: url(../images/brief.gif); -} - -input.cancel { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px; -} - -input.cart, a.cart { - background-image: url(../images/cart.gif); -} - -input.clearall, a.clearall { - background-image: url(../images/clearbasket.gif); -} - -input.close, a.close { - background-image: url(../images/close.gif); -} - -input.delete, a.delete { - background-image: url(../images/delete.gif); -} - -input.detail, a.detail { - background-image: url(../images/detail.gif); -} - -input.edit, a.edit { - background-image: url(../images/edit.gif); -} - -input.icon { - background-position: left; - background-repeat: no-repeat; - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px 2px 2px 22px; -} - -input.isbd, a.isbd { - background-image: url(../images/isbd.gif); -} - -input.print, a.print { - background-image: url(../images/print2.gif); -} - -input.remove, a.remove { - background-image: url(../images/remove.gif); -} - -input.reserve, a.reserve { - background-image: url(../images/placereserve.gif); -} - -input.send, a.send { - background-image: url(../images/send.gif); -} - -input.shelf, a.shelf { - background-image: url(../images/addtoshelf.gif); -} - -input.trash, a.trash { - background-image: url(../images/trash.gif); -} - -p { - padding: 0 10px 0 10px; -} - -p.error, div.error { - font-weight: normal; - margin: auto; - padding: 5px 20px 5px 20px; -} - -p.error+p.error, div.error+div.error { - margin-top: 5px; -} - -p+h3 { - margin-top: .6em; -} - -p+h5 { - margin: 0; - padding: 3px 0 2px 0; -} - -span.itemicon { - float : left; - font-size: .9em; - margin: 2px; - white-space: nowrap; -} - -span.print { - font-size: .7em; - font-weight: normal; - padding-left: .7em; -} - -table { - border-collapse: collapse; - margin: 5px 0 5px 0; - padding: 0; -} - -*html td, *html th { - font-size : .8em; -} - -td { - padding: 3px; -} - -td.input, div.form td, div.details td { - border-left: 0; - border-right: 0; - padding: 2px 2px 2px 4px; - text-align: right; -} - -td.credit { - text-align: right; -} - -td.debit { - text-align: right; -} - -td.sum, th.sum { - text-align: right; -} - -td.sum { - font-weight: bold; -} - -td.label { - font-weight: bold; - line-height: 1.5em; - padding: 4px; -} - -td.label, div.form th, div.details th { - border-right: 0; - border-top: 0; - font-weight: bold; - padding: 2px 2px 2px 4px; - text-align: left; - vertical-align: top; -} - -td.search-options select { -} - -td:last-child { - padding: 3px; -} - -th { - font-weight: bold; - padding: 2px; -} - -th a { - font-weight: bold; - text-decoration: none; -} - -th:last-child { - font-weight: bold; - padding: 2px; -} - -th[scope="row"] { - font-weight: normal; - text-align: right; -} - -ul#facets { - margin: 3px; -} - -#nav ul#facets { - margin : 0; - padding : 0; -} - -#nav ul#facets li { - font-weight: bold; - text-align: left; -} - -#nav ul#facets li#branch_facet, #nav ul#facets li#subject_facet, #nav ul#facets li#series_facet, #nav ul#facets li#author_facet { -} - -#nav ul#facets ul li { - border: 0; - font-size: .95em; - font-weight: normal; - padding: 2px; - text-align: left; -} - -#nav ul#facets ul li a { - font-weight: normal; - text-decoration: underline; -} - -#nav ul#facets ul li.showmore { - text-align: center; -} - -#nav ul#facets ul li.showmore a { - font-weight: bold; - text-decoration: none; -} - -/* Tabs */ -ul.link-tabs { - list-style-type: none; - margin: 9px 0 -2px 5px; - padding: 0; -} - -ul.link-tabs li { - display: inline; - padding: 0px; -} - -ul.link-tabs li a { - font-weight: bold; - padding: 2px 4px 2px 4px; - text-decoration: none; -} - -ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a { - padding: 2px 4px 3px 4px; -} - -ul.link-tabs li.off a { -} - -ul.link-tabs li.off a:hover { - padding: 2px 3px 2px 4px; -} - -ul.link-tabs li.on a { -} - -.clear { - clear: both; - line-height: .1em; -} - -.content-block { - padding: 5px; -} - -#home { - text-align : center; -} - -#home #searchform input.submit { - font-size : 1.3em; -} - -div#advanced-search p { - margin: .4em; - -} - -div#advanced-search fieldset { - /*margin-left : -1em;*/ - margin-bottom: .3em; - background-color : #eeeeee; - -} - -div#advanced-search fieldset p { - margin-left : 1em; - white-space: nowrap; - - -} - -table.itemtypes { - border-collapse: separate; - border-spacing: 3px; - display: block; - padding: 0; - margin: 0; -} - -div#advanced-search legend, div#sidebar legend { - font-weight: bold; -} - -div#advanced-search label { - -} - -.count { - font-weight: normal; -} - -.current { - font-weight: bold; - padding: 1px 5px 1px 5px; - text-decoration: none; -} - -.detail-sidebar { - float: right; - padding: 5px; - margin-left : 15px; - margin-right : 5px; - text-align: center; - width : 25%; -} - -.detail-sidebar .further { - float: none; - text-align: left; - width : 90%; -} - -.further { - margin: 5px; - text-align: left; - width : 90%; -} - -.ex { - font-family: "Courier New", Courier, monospace; -} - -.further h4 { - padding: 2px; -} - -.further li { - padding: 2px 0; -} - -.further ul, .further li { - list-style: none; - margin: .5em 0 .7em .4em; - padding: 0; -} - -.inline { - display: inline; -} - -.item-datedue { - font-style: italic; -} - -.item-details { - display: block; - margin: 0 0 0 25px; -} - -.item-reserved, .item-notforloan, .item-lost, .item-cancelled, .item-damaged, .item-reserved { - display: block; -} - -.labelsubfield { - clear: both; /* style for each subfield (like : a Publication year), just before the biblio subfield */ - float: left; - font-weight: bold; - margin-left: 30px; - width: 12em; -} - -.left { - float: left; -} - -.loggedin { - font-weight: bold; -} - -.login-note { - width: 35%; -} - -.menu { - line-height: 3em; - font-size: 1.2em; - margin: 0; - padding: 5px; -} - -.menu a.logout { - font-weight: bold; - padding: 3px 15px 3px 15px; - text-decoration: none; -} - -.menu a:link, #members a:link { - padding: 2px; -} - -.menu a:visited, #members a:visited { - padding: 2px; -} - -.menu a:hover, #members a:hover { - padding: 2px; -} - -.menu a:active, #members a:active { - padding: 2px; -} - -.menu input { -} - -.menu label { - font-weight: bold; -} - -.menu p { - margin: 0; - padding: 0; -} - -.menu p+p { - margin-top: 5px; -} - -.note { - margin: 10px auto; - padding: 4px 4px 4px 4px; - width: 35%; -} - -.opac-detail { - padding: 4px; -} - -.opac-detail dd { - display: block; - line-height: 1.5em; - padding: 4px; - text-align: right; -} - -.operations { - margin-top: 7px; - padding: 0 10px; - text-align: center; - width: 100%; -} - -.operations img { - padding: 5px; -} - -.operations li { - list-style-type: none; - margin: 0; - padding-bottom: 2px; -} - -.operations li a, .operations li a:visited { - background-position: top left; - background-repeat: no-repeat; - border-style: outset; - display: block; - padding: 3px 3px 3px 26px; - text-decoration: none; -} - -.searchresults a.reserve, .searchresults a.reserve:visited { - background-position: top left; - background-repeat: no-repeat;/* - border-style: outset;*/ - float: right; - padding: 2px 3px 2px 26px; - /*text-decoration: none;*/ -} - -.operations li a:active { - border-style: inset; -} - -.operations ul { - margin: 0; - padding: 0; - width: 90%; -} - -.overdue { - font-weight: bold; -} - -.pages { - line-height : 1.8em; - text-align: center; -} - -.rejected { - text-decoration: line-through; -} - -.right { - float: right; -} - -.search-main { - float: left; - width: 65%; -} - -.searchresults input, .searchresults label, .searchresults select { - font-size: .8em; -} - -.searchresults p { - margin: 0; - padding: 0; - padding-top : .6em; -} - -.searchresults p img { - vertical-align: middle; -} - -.searchresults table td { - vertical-align: top; -} - -p.searchresults { - margin-top : -5px; - text-align : right; - vertical-align : middle; - padding-bottom : 3px; -} - -.selected { - text-decoration: none; -} - -.sidebar-box { - margin-bottom: 0; -} - -.sidebar-box h3, .sidebar-box h4 { - margin-left: 10px; -} - -.sidebar-box p { - margin: 3px 10px; - padding: 0; -} - -.submit { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-size : .9em; - font-weight: bold; - padding: 2px; -} - -.term { - font-weight: bold; -} - -.thumbnail { - border: 0; - float: left; - margin: 0 5px 5px 0; -} - -.title { - font-style: italic; - font-weight: bold; -} - -#sidebar .content-block { - margin : 0 10px 0 0; -} - -form#auth h3 { - font-size : 1.1em; -} - -#footer { - clear: both; - padding: 10px; - text-align: center; -} - -#corner { - position: absolute; - top: 10px; - right: 5px; -} - -#corner a.cart { - background-image : url(../images/cart-small.gif); - background-position: left; - background-repeat : no-repeat; - padding: 0 15px; - text-decoration: none; -} - -#languages { - display: inline; -} - -#languages ul { - display : inline; - list-style: none; - margin: 0; - padding : 0; -} - -#languages ul li { - display: inline; - font-family: Arial, Helvetica, sans-serif; - font-size: .9em; -} - -#languages ul li a { - font-weight: normal; - padding: 0 3px; - text-decoration: none; -} - -#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label { - font-weight: bold; - text-align: right; -} - -#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity { - margin: 5px; - width: 96%; -} - -/*#main { - margin-left: 20%; - margin-right: 0; - padding: 0; - position: relative; -}*/ - -#masthead { - margin: 0; - margin-bottom : 1em; - padding: 0; - text-align:center; - -} - -#members { - font-size: .8em; - font-weight: bold; - padding: 4px 0 4px 0; -} - -#members a.card { - background-image: url(../images/card.gif); - background-position: left; - background-repeat: no-repeat; - display: block; - padding-left: 39px; -} - -#members a.logout { - font-weight: bold; - padding: 0 .3em 0 .3em; - text-decoration: none; -} - -#members li { - display: inline; - list-style: none; - margin: 0; -} - -#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members { - padding : 4px; -} - -#members ul li:last-child { -} - -#members ul li a:hover { -} - -#members ul { - margin: 0; - padding: 0; - text-align: right; -} - -/*#nav { - float: left; - margin: 0; - padding: 0; - width: 20%; -}*/ - -#nav a { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - text-decoration: none; -} - -#nav h6 { - padding: 3px; - text-align: center; -} - -#nav li ul li { - font-family: Arial, Geneva, Helvetica, sans-serif; - list-style: none; - margin: 0; - padding: 5px 3px 5px 3px; - text-align: right; -} - -#nav li ul li a { - font-family: Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - text-decoration: none; -} - -#nav ul { - margin: 0; - padding: 0; -} - -#nav ul li { - font-family: Arial, Geneva, Helvetica, sans-serif; - list-style: none; - margin: 0; - padding: 3px 8px 3px 3px; - text-align: right; -} - -#nav ul li+li { - margin: 0; -} - -#power_formButton, #proximity_formButton { -} - -#results, .results { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - margin: 0; - padding: 7px 0 10px 0; -} - -#search-footer { - margin: auto; - text-align: center; -} - -#search-footer a { - margin: 3px 5px 3px 5px; - padding: 2px 5px; - text-decoration: none; -} - -#searchform input.submit { - font-size: .8em; -} - -#search-sidebar { - float: right; - margin: 10px; - padding: 3px; - width: 30%; -} - -#search-sidebar .sidebar-box label { - display: block; - text-align: left; -} - -/*#sidebar { - float: right; - margin: 20px; - padding: 5px; - width: 20%; -}*/ - -#sidebar .submit { - font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; - font-weight: bold; - padding: 2px; - font-size: 1em; -} - -#sidebar h3 { - font-family: Arial, Geneva, Helvetica, sans-serif; - margin: 0; - padding: 5px 0 1px 0; -} - -#sort { - margin: .3em; -} - -#sort, #sort select, #sort input { -} - -#starFull { - background: url(../images/bluestars.png) top left no-repeat; - height: 25px; - margin: 0; - padding: 0; -} - -#starMT { - background: url(../images/emptystars.png) top left no-repeat; - height: 25px; - margin: 0 3px 0 30px; - padding: 0; - position: relative; - width: 100px; -} - -#window { - margin-left: 2%; - margin-right: 2%; - margin-top: 2%; - padding: 10px; -} - -#window .class { - display: block; - font-weight: bold; - padding: 0 0 5px 3px; -} - -#window div.menu { - margin: 0; - -} - -div#item-details { - margin-bottom : 1.5em; -} - -div#item-details img { - float : left; - padding : 1em; -} - -div#item-details p { - margin : .1em 0; - line-height : 1.6em; -} - -div#holdings table { - width : 100%; -} - -div#holdings td, div#holdings th { - padding : 5px; -} - -div#holdings, div#descriptions, div#reviews, div#serials, div#publicshelves, div#privateshelves, div#fines, div#waiting, div#overdues, div#issues, div#reserves { - margin-top : 4px; - padding : .7em; - width : 90%; -} - -#usermenu { - font-size: .9em; - font-weight: bold; - margin-top : -1.1em; - margin-bottom : 1em; - padding: 4px 0 4px 0; - - -} - -#usermenu li { - display: inline; - list-style: none; - margin: 0; -} - -#usermenu ul li a:link, #usermenu ul li a:visited, #usermenu ul li a:hover, #usermenu ul li a:active, #usermenu span.members { - padding : 4px; -} - -#usermenu ul li:last-child { -} - -#usermenu ul li a:hover { -} - -#usermenu ul { - margin: 0; - padding: 0; - text-align: right; -} - -table.featured-item { - border-collapse : separate; - border-spacing: 9px; - margin : 5px; - text-align : center; -} - -table.featured-item td { - vertical-align : top; -} - -table.featured-item a img { - margin : auto; -} - -table.featured-item a.title { - display : block; - font-size : 1em; - margin-bottom : .4em; -} - -table.featured-item .author { - display : block; - font-size : .95em; - margin-bottom : .2em; -} - -table.featured-item .publisher { - display : block; - font-size : .8em; -} - -/* COLORS, BACKGROUNDS, AND BORDERS */ - -a { - color: #006699; -} - -a:link.current { - background-color: transparent; - color: #3366CC; -} - -a:link.nav { - background-color: #EFF1DC; - border: 1px solid #CCCC99; - color: #3366CC; -} - -a:visited { - color: #006699; -} - -a:visited.current { - background-color: transparent; - color: #3366CC; -} - -a:visited.nav { - background-color: #EFF1DC; - border: 1px solid #CCCC99; - color: #3366CC; -} - -a:hover { - color: orange; -} - -a:hover.current { - background-color: #CCFF00; - color: #CC3333; -} - -a:hover.nav { - background-color: #FFFFCC; - border: 1px solid #CCCC99; - color: #CC3333; -} - -a:active { - color: #990033; -} - -a:active.current { - background-color: #99CC00; - color: #FFFF99; -} - -a:active.nav { - background-color: #FFFFCC; - border: 1px solid #CCCC99; - color: #D25500; -} - -a.reserve { - background-color: #006699; - color: White; -} - -body { - background-color: #eeeeee; -} - -body#withsidebar #main { - border: 0; - -} -ul { -background-color:#eeeeee; -text-align: left; -} - -caption { - color: #000066; -} - -div.error h3 { - color: #990000; -} - -div.form, div.details { - background-color: #ffffff; -} - -div.tab { - background-color: transparent; -} - -div.tab p { - border-bottom: 1px solid #FFFFFF; - border-top: 1px solid #D8DEB8; -} - -div.tabbloc { - background-color: transparent; -} - -div#advanced-search fieldset { - border-right : 1px none #999999; - border-top : 1px none #999999; - border-bottom : 1px none #999999; - border-left : 1px none #999999; -} - -div#advanced-search legend { - color : #003366; -} - -dl.details dt { - color: #000066; -} - -em.new { - color: #CC3333; -} - -h1,h2,h3,h4,h5,h6 { - color: navy; - background-color:navy; - color:white; -} - -h1.logo { - color: #D3DFAD; - -} - -h1#libraryname a { - color: #000066; - margin-left: .3em; - text-decoration: none; -} - -input.icon { - background-color: #6699CC; - border: 1px outset #666666; - color: #FFFFCC; -} - -p.availability { - color: #666666; - font-size: .9em; -} - -p.error, div.error { - background-color: #FFFFCC; - border: 1px dashed #CC6600; -} - -span.itemicon { - background-color : #F8F8EB; - border: 1px solid #D8DEB8; -} - -table { - background-color: #FFFFFF; -} - -table.itemtypes td { - background-color: #F8F8EB; - border: 1px solid #D8DEB8; -} - -td { - background-color: #FFFFFF; - border-bottom: 1px solid #DDDDDD; - border-right: 1px solid #DDDDDD; -} - -td.input, div.form td, div.details td { - border-bottom: 1px solid #CCCCCC; - border-left: 0; - border-right: 0; - color: #000000; -} - -td.credit { - color: #000066; -} - -td.debit { - color: #990000; -} - -td.sum, th.sum { -} - -td.sum { - background-color : #FFFFCC; -} - -td.label { - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #CCCCCC; - color: #000088; -} - -td.label, div.form th, div.details th { - background-color: #FFFFFF; - border-bottom: 1px solid #CCCCCC; - border-left: 1px solid #CCCCCC; - border-right: 0; - border-top: 0; - color: #000088; -} - -div.details { - padding: 5px; - -} - -div.details table, div.details td, div.details th { - border: 0; - border-bottom: 1px solid #DDDDDD; -} - -td.overdue { - color: #CC0000; -} - -td:last-child { - border-bottom: 1px solid #CCCCCC; - border-right: 0 solid #CCCCCC; -} - -th { - background-color: #EFF1DC; - border-bottom: 1px solid #CCCCCC; - border-right: 1px solid #CCCCCC; -} - -th:last-child { - background-color: #EFF1DC; - border-bottom: 1px solid #CCCCCC; - border-right: 0 solid #CCCCCC; -} - -th[scope="row"] { - background-color: #E7E7CA; -} - -tr.highlight { - background-color: #F8F8EB; -} - -tr.highlight th[scope="row"] { - background-color: #EEEEEE; -} - -tr.overdue td { - background-color: #FFDDDD; -} - -input.cancel { - background-color: #990033; - border: 1px outset #666666; - color: #FFFFCC; -} - -.available { - color : #006600; -} - -.content-block { - background-color: #FFFFFF; -} - -.current { - background-color: #FFFFFF; - color: #3366CC; -} - -.detail-sidebar { - background-color: #EEEEEB; -} - -.further { - background-color: #EEEEEB; - border: 2px solid #DDDED3; - color: #CCCC99; -} - -.further h4 { - background-color: #D8DEB8; -} - -.further li { -} - -.issued { - color: #999999; -} - -.labelsubfield { -} - -.loggedin { - color: #D8DEB8; -} - -.loggedinusername { - color: #666666; -} - -.marcsubfieldletter { - background-color: #EFF1DC; -} - -.marcsubfieldname { - background-color: #EFF1DC; -} - -.MARCtag { - background-color: #EEEEEE; - color: #000066; /* style for tag definition (700 - Statement of responsability) */ -} - -.menu { - background-image : url(../images/menu-background.gif); - background-repeat: repeat-x; - background-color: #6699CC; - border-top: 1px solid #335599; - border-bottom: 1px solid #335599; - color: #FFFFFF; - -} - -.menu a:link { - color : #FFFFCC; -} - -.menu a:visited { - color : #FFFFCC; -} - -.menu a:hover { - color : #FFFFFF; -} - -.menu a:active { - color : #FFFF99; -} - -#members a:link { - color: #0099CC; -} - -#members a:visited { - color: #0099CC; -} - -#members a:hover { - color: #990000; -} - -#members a:active { - color: #990000; -} - -.menu input.submit { - background-color : #6BA037; - color: #FFFFFF; -} - -.note { - background-color: #EEEEEB; - border-bottom: 1px solid #DDDED3; - border-left: 1px solid #DDDED3; - border-right: 1px solid #DDDED3; - border-top: 1px solid #DDDED3; -} - -.opac-detail { - background-color: #FFFFCC; -} - -.opac-detail dd { - border-bottom: 1px solid #E7E7CA; - color: #000000; -} - -.operations li a, .operations li a:visited { - background-color: #6699CC; - border: 2px solid #D8DEB8; - color: #FFFFCC; -} - -.operations li a:hover { - background-color: #0099FF; - color: #FFFF99; -} - -.operations li a:active { - background-color: #0099FF; - color: #FFFF99; -} - - -.item-reserved { - color : #009933; -} - -.item-datedue { - color: #999999; -} - -.item-notforloan, .item-lost, .item-cancelled, .item-damaged, .item-reserved { -} - -.searchresults td, .searchresults th, .searchresults table { - border: 0; -} - -.searchresults tr { - border-bottom : 1px solid #CCCCCC; -} - -.searchresults table { - border-top : 0px solid #CCCCCC; -} - -p.searchresults { - background-color : #EFF1DC; -} - -.searchresults a.reserve { - background-color : transparent; - color : #006699;/* - background-color : #6699CC; - border: 1px outset #666666; - color : White;*/ -} - -.sidebar-box { - border: 1px dashed #CCCCCC; -} - -.subfield { - background-color: #EFF1DC; -} - -.subfieldvalue { - background-color: #FFFFFF; -} - -.submit { - background-color: #EEC95A; - border: 3px outset #666666; - color: #FFFFFF; -} - -.term { - background-color: #FFFFCC; - color: #990000; -} - -.unavailable { - color: #990033; -} - -#footer { - border-top: 1px solid #EEEEEE; -} - -#languages ul li a { - border: 1px solid #D8DEB8; -} - -#languages ul li a:hover { - background-color: #FFFFCC; -} - -#main { - background-color: transparent;/* - border-top: 1px solid #EEEEEE;*/ -} - -#masthead { - background-color: #FFFFFF;/* - border-bottom: 1px solid #EEEEEE;*/ -} - -#members { - background-image : url(../images/member-menu-background.gif); - background-repeat: repeat-x; - border-top: 1px solid #9999CC; - border-bottom : 1px solid #9999CC; - background-color: #AFBCCF; - color: #000066; -} - -#members ul li a:link, #members ul li a:visited, #members span.members { - background-image : url(../images/member-menu-background-link.gif); - background-repeat: repeat-x; - border-left: 1px solid #9999CC; - color: #006699; -} - -#members ul li:last-child a { - border-right : 1px solid #9999CC; -} - -#members ul li a:hover, #members ul li a:active { - background-image : url(../images/member-menu-background-hover.gif); - background-repeat: repeat-x; -} - -#members a { - text-decoration: none; -} - -#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active { - background-image : url(../images/member-menu-background-logout.gif); - background-repeat: repeat-x; - color: #000000; -} - -#members a:hover.logout { - background-image : url(../images/member-menu-background-logout-hover.gif); - background-repeat: repeat-x; - color: #000000; -} - -#nav { - /*background-color: #EFF1DC;*/ - border : 1px solid #EFF1DC; - -} - -#nav h6 { - background-color: #E7E7CA; - line-height : 1.8em; - margin-left: -1px; - margin-top : -1px; - margin-right : -1px; -} - -#nav li ul li {/* - background-color: #E7E7CA;*/ - border-bottom: 0 solid #D8DEB8; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; - border-top: 0 solid #FFFFCC; -} - -#nav li ul li a { - color: #0000FF; -} - -#nav li ul li a:link { - color: #335599; -} - -#nav li ul li a:visited { - color: #335599; -} - -#nav li ul li a:hover { - color: #CC3333; -} - -#nav ul li { - /* background-color: #EFF1DC; */ - border-bottom: 0px solid #CCCC99; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; - border-top: 0 solid #FFFFCC; -} - -#nav ul li+li { - border-bottom: 0px solid #CCCC99; - border-left: 0 solid #FFFFCC; - border-right: 0 solid #006699; -} - -#results, .results { - color: #000066; -} - -#search-sidebar { - background-color: #F8F8EB; -} - -#sidebar { - /*background-color: #F8F8EB; - border: 1px dashed #666666;*/ -} - -#sidebar .content-block { - background-color : #EEEEEE; -} - -#sidebar fieldset { - background-color: #F9F9FF; -} - -#sidebar legend { - color : #003366; -} - -#sidebar .submit { -/* background-color: #EEC95A; */ - color: #FFFFFF; -} - -#sidebar h3 { - color: #000066; -} - -#window { - background-color: #E7E7CA; - border-left: 1px solid #CCCC99; -} -ul.link-tabs { -} - -ul.link-tabs li { -} - -ul.link-tabs li a { - border-top: 1px solid #DDDDDD; - border-left : 1px solid #DDDDDD; - border-right : 1px solid #666666; -} - -ul.link-tabs li.on a { - background-color: #FFFFFF; - border-bottom: 1px solid #FFFFFF; -} - -ul.link-tabs li.off a { - background-color: #EEEEEB; - border-bottom: 1px solid #DDDDDD; -} - -ul.link-tabs li.off a:hover { - background-color: #FFFFEC; - border-top: 1px solid #BEBF84; - border-left : 1px solid #BEBF84; - border-right : 2px solid #333333; -} - -ul.link-tabs li a.debit { - background-color : #FFFF99; - color : #990033; -} - -div#holdings, div#descriptions, div#reviews, div#serials, div#publicshelves, div#privateshelves, div#fines, div#waiting, div#overdues, div#issues, div#reserves { - border : 1px solid #DDDDDD; -} - -div#holdings table { - border-top : 1px solid #DDDDDD; - border-right : 1px solid #DDDDDD; -} - -div#holdings td, div#holdings th { - border-left : 1px solid #DDDDDD; - border-bottom : 1px solid #DDDDDD; -} - -#usermenu { - background-image : url(../images/usermenu-background.gif); - background-repeat: repeat-x; - background-color: #EEEEEB; - border-top: 1px solid #EEEEEE; - border-bottom: 1px solid #335599; - color: #000000; -} - -#usermenu ul li a:link, #usermenu ul li a:visited { - background-image : url(../images/usermenu-background.gif); - background-repeat: repeat-x; - border-left: 1px solid #9999CC; - color: #006699; -} - -#usermenu ul li:last-child a { - border-right : 1px solid #9999CC; -} - -#usermenu ul li a:hover, #usermenu ul li a:active { - background-image : url(../images/usermenu-background-hover.gif); - background-repeat: repeat-x; -} - -#usermenu a { - text-decoration: none; -} - -table.featured-item { - border : 0; -} - -table.featured-item td { - border : 1px solid #CCCCCC; -} - -table.featured-item a img { -} - -table.featured-item a.title { -} - -table.featured-item .author { -} - -table.featured-item .publisher { -} -h1{ -background-color: #eeeeee; -color: navy; -background-image: url(./acceuil.jpg); -background-repeat:no-repeat; -} -h1.authority -{ -background-image:none; - -} \ No newline at end of file -- 1.7.9.5 From oleonard at myacpl.org Thu Dec 13 21:19:37 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 13 Dec 2012 15:19:37 -0500 Subject: [Koha-patches] [PATCH] Bug 9283 - Change structure of export checkouts form Message-ID: <1355429977-13229-1-git-send-email-oleonard@myacpl.org> This patch changes the structure of the export checkouts form so that it is a little more linear. This change moves generation of the export options from JavaScript to the markup, eliminating an instance of dependence on YUI menus. To test, enable checkout exports by specifying a value for ExportWithCsvProfile or ExportRemoveFields. Load a patron with checkouts in circulation. Try the various checkout export options. Each should function correctly. --- .../prog/en/modules/circ/circulation.tt | 40 +++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index c860ed6..e1d7b0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -157,8 +157,6 @@ var allcheckboxes = $(".checkboxed"); $("input.radio").click(function(){ radioCheckBox($(this)); }); - $("#exportmenuc").empty(); - initExportButton(); $("#newduedate").datetimepicker({ minDate: 1, // require that renewal date is after today @@ -170,25 +168,14 @@ var allcheckboxes = $(".checkboxed"); hour: 23, minute: 59 }); - + $("#export_submit").click(function(){ + var export_format = $("#export_formats").val(); + export_checkouts(export_format); + return false; + }) }); -function initExportButton() { - var exportmenu = [ - { text: _("ISO2709 with items"), onclick: {fn: function(){export_submit("iso2709_995")}} }, - { text: _("ISO2709 without items"), onclick: {fn: function(){export_submit("iso2709")}} }, - { text: _("CSV"), onclick: {fn: function(){export_submit("csv")}} }, - ]; - new YAHOO.widget.Button({ - type: "menu", - label: _("Export checkouts"), - name: "exportmenubutton", - menu: exportmenu, - container: "exportmenuc" - }); -} - -function export_submit(format) { +function export_checkouts(format) { if ($("input:checkbox[name='biblionumbers'][checked]").length < 1){ alert(_("You must select a checkout to export")); return; @@ -954,16 +941,23 @@ No patron matched <span class="ex">[% message %]</span> [% END %] <input type="submit" name="renew_checked" value="Renew or Return checked items" /> <input type="submit" id="renew_all" name="renew_all" value="Renew all" /> + </fieldset> [% IF export_remove_fields OR export_with_csv_profile %] - <br/><br/> - Don't export fields : <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" /> - <span id="exportmenuc">Export</span> + <fieldset> + <label for="export_formats"><b>Export checkouts using format:</b></label> + <select name="export_formats" id="export_formats"> + <option value="iso2709_995">ISO2709 with items</option> + <option value="iso2709">ISO2709 without items</option> + <option value="csv">CSV</option> + </select> + <label for="export_remove_fields">Don't export fields:</label> <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" /> <input type="hidden" name="op" value="export" /> <input type="hidden" id="export_format" name="format" value="iso2709" /> <input type="hidden" id="dont_export_item" name="dont_export_item" value="0" /> <input type="hidden" id="record_type" name="record_type" value="bibs" /> + <input type="button" id="export_submit" value="Export" /> + </fieldset> [% END %] - </fieldset> [% END %] </form> [% ELSE %] -- 1.7.9.5 From robin at catalyst.net.nz Fri Dec 14 04:29:05 2012 From: robin at catalyst.net.nz (Robin Sheat) Date: Fri, 14 Dec 2012 16:29:05 +1300 Subject: [Koha-patches] [PATCH] Bug 9052 - rewrite the YUI links to use the system library Message-ID: <1355455745-16544-1-git-send-email-robin@catalyst.net.nz> This uses libjs-yui to provide the skin.css and reset-fonts-grids.css files from YUI. It patches the CSS files to point to the right location for the files. To test: * Build a package with this patch included * Install it * Look at the OPAC and note that things no longer look terrible, and that there are no 404's coming from bad CSS URLs. --- debian/rules | 6 ++++-- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 3 +++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index cb2eee3..0b75d09 100755 --- a/debian/rules +++ b/debian/rules @@ -92,10 +92,12 @@ override_dh_auto_install: $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css install -m 0644 koha-tmpl/intranet-tmpl/prog/en/lib/yui/sprite.png \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css + sed -i -e 's:url(.*/reset-fonts-grids.css.*):url("/opac-tmpl/lib/yui/reset-fonts-grids/reset-fonts-grids.css"):' \ + -e 's:url(.*/skin.css.*):url("/opac-tmpl/lib/yui/assets/skins/sam/skin.css"):' \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \ + $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css sed -i -e 's:url(.*/reset-fonts-grids.css.*):url(reset-fonts-grids.css):' \ -e 's:url(.*/skin.css.*):url(skin.css):' \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/opac.css \ - $(TMP)/usr/share/koha/opac/htdocs/opac-tmpl/prog/en/css/sco.css \ $(TMP)/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/css/staff-global*.css mkdir -p $(TMP)/debian/tmp_docbook xsltproc --output $(TMP)/debian/tmp_docbook/ \ diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 06e6bcf..e57aaf3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1,3 +1,6 @@ + at import url("/opac-tmpl/lib/yui/reset-fonts-grids.css"); + at import url("/opac-tmpl/lib/yui/skin.css"); + a { font-weight : bold; } diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 4f0e540..1bc9eb3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -3,8 +3,6 @@ <meta name="generator" content="Koha [% Version %]" /> <!-- leave this for stats --> <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% themelang %]/includes/favicon.ico[% END %]" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="[% themelang %]/lib/jquery/jquery-ui.css" /> -<link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/reset-fonts-grids.css" /> -<link rel="stylesheet" type="text/css" href="/opac-tmpl/lib/yui/skin.css" /> [% SET opaclayoutstylesheet='opac.css' UNLESS opaclayoutstylesheet %] [% IF (opaclayoutstylesheet.match('^https?:|^\/')) %] <link rel="stylesheet" type="text/css" href="[% opaclayoutstylesheet %]" /> -- 1.7.9.5 From oleonard at myacpl.org Fri Dec 14 16:50:17 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Fri, 14 Dec 2012 10:50:17 -0500 Subject: [Koha-patches] [PATCH] Bug 8033 [Follow-up] add print receipt option to Koha self-check Message-ID: <1355500217-14737-1-git-send-email-oleonard@myacpl.org> This follow-up makes some corrections to JavaScript, most importantly by enabling translation of strings embedded in the script. Other corrections: Trailing whitespace, proper <![CDATA[ commenting, and === comparisons (Following coding/JSHint guidelines). To test, check something out in self checkout and click the "Finish" button. The JavaScript confirmation dialog should appear and the receipt should appear and self-close correctly. --- .../opac-tmpl/prog/en/modules/sco/printslip.tt | 2 ++ koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt | 6 ++++-- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 9 +++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt index eaa0d30..44954b3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/printslip.tt @@ -8,10 +8,12 @@ [% END %] <script language="javascript"> +//<![CDATA[ function printThenClose() { window.print(); window.close(); } +//]]> </script> </head> <body id="circ_printslip" class="circ" onload="printThenClose();"> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt index 8178412..41be4e4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt @@ -4,7 +4,8 @@ <head> <title> RECEIPT - diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index 1398673..a2db46f 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -11,6 +11,7 @@ [% END %] + @@ -948,7 +807,11 @@ No patron matched [% message %] -- 1.7.9.5 From robin at catalyst.net.nz Tue Dec 18 05:50:40 2012 From: robin at catalyst.net.nz (Robin Sheat) Date: Tue, 18 Dec 2012 17:50:40 +1300 Subject: [Koha-patches] [PATCH] Bug 9052 - followup: fix the YUI CSS locations for SCO Message-ID: <1355806240-31930-1-git-send-email-robin@catalyst.net.nz> This is followup to the previous YUI-fixing patch, and simply causes the self-checkout page to load the YUI files via the sco CSS file, and that gets re-written at package build time to work. --- koha-tmpl/opac-tmpl/prog/en/css/sco.css | 3 +++ koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt | 2 -- .../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css index 4d8e25a..0ad366d 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/sco.css @@ -1,3 +1,6 @@ + at import url("/opac-tmpl/lib/yui/reset-fonts-grids.css"); + at import url("/opac-tmpl/lib/yui/skin.css"); + a { font-weight : bold; } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt index 32b4f56..df4f0d3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt @@ -3,8 +3,6 @@ - - diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt index 1398673..3fdf2f4 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt @@ -110,8 +110,6 @@ $(document).ready(function(){ [% IF ( opacuserjs ) %][% END %] - - [% IF ( OPACUserCSS ) %][% END %] -- 1.7.9.5 From nengard at bywatersolutions.com Wed Dec 19 05:09:20 2012 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Tue, 18 Dec 2012 23:09:20 -0500 Subject: [Koha-patches] [PATCH] Bug 9306: Update descriptions for the 4 SeparateHoldings prefs Message-ID: <1355890160-19317-1-git-send-email-nengard@bywatersolutions.com> Just a string patch making these prefs a bit clearer. --- .../en/modules/admin/preferences/cataloguing.pref | 4 ++-- .../prog/en/modules/admin/preferences/opac.pref | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index f2a16c6..f2ba76e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -161,9 +161,9 @@ Cataloging: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: SeparateHoldingsBranch choices: homebranch: 'home branch' holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + - "is the logged in user's branch. The second tab will contain all other items." diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 9239f12..1977bed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -263,12 +263,12 @@ OPAC: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: OpacSeparateHoldingsBranch choices: homebranch: 'home branch' holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + - "is the logged in user's branch. The second tab will contain all other items." Features: - - pref: opacuserlogin -- 1.7.2.3 From robin at catalyst.net.nz Thu Dec 20 03:51:56 2012 From: robin at catalyst.net.nz (Robin Sheat) Date: Thu, 20 Dec 2012 15:51:56 +1300 Subject: [Koha-patches] [PATCH] Bug 9309 - Make OPACurlOpenInNewWindow be respected for 856$u Message-ID: <1355971916-23739-1-git-send-email-robin@catalyst.net.nz> If a biblio record contained a URL, and the OPAC was using the "normal" (non-XSLT) display for records, then these links would never open a new window. With this patch, they will. Test plan: 1) have a biblio containing an 856$u link 2) set OPACurlOpenInNewWindow to "true" 3) do not use XSLT for displaying the detail pages in the OPAC 4) view the record, click the link, and note that it opens in the current window. 5) apply the patch 6) reload the detail page, click the link, and note that it opens a new window. --- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 763354d..485dea6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -478,7 +478,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
[% END %] - [% IF ( MARCurl.OPACurlOpenInNewWindow ) %][% ELSE %][% END %] + [% IF ( OPACurlOpenInNewWindow ) %][% ELSE %][% END %] [% MARCurl.linktext %] [% IF ( MARCurl.notes ) %]
    [% FOREACH note IN MARCurl.notes %]
  • [% note.note %]
    • [% END %]
[% END %] -- 1.7.9.5 From oleonard at myacpl.org Thu Dec 20 15:56:32 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 20 Dec 2012 09:56:32 -0500 Subject: [Koha-patches] [PATCH] Bug 9310 - Patron image upload template corrections Message-ID: <1356015392-7467-1-git-send-email-oleonard@myacpl.org> This patch fixes some template structure problems and makes some improvements: - Correct grid structure so that page isn't narrower than it needs to be. - Move image upload messages out of message/error dialog and into table so that lines are distinct and legible. - Expand breadcrumbs specificity - Capitalization corrections To test: Upload patron images using both single images and zip files. Test zip file upload with a file which contains valid and invalid contents (non-existant patron numbers, invalid image files, etc). In all cases image uploads should work correctly and errors should be legibly displayed. --- .../prog/en/modules/tools/picture-upload.tt | 67 +++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt index 51a78c5..ef22fe1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt @@ -17,26 +17,27 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
[% IF ( TOTAL ) %]
-
-
[% IF ( ERRORS ) %] [% IF ( TCOUNTS ) %]
-

Patron Image(s) Uploaded with some errors

+

Patron image(s) uploaded with some errors

+
[% ELSE %]

Patron image failed to upload

+
[% END %] [% ELSE %]

Patron image(s) successfully uploaded

+
[% END %]
  • Unpacking completed
    • @@ -45,41 +46,49 @@
[% FOREACH COUNT IN COUNTS %] -
    +
    + + + + + + [% IF ( COUNT.TCOUNTS ) %]
  • [% COUNT.TCOUNTS %] image(s) moved into the database:
    • [% END %] [% FOREACH filename IN COUNT.filenames %] -
  • [% filename.source %] - Cardnumber: [% filename.cardnumber %] - [% IF ( filename.filerrors ) %] +
    • + + + + [% END %] - + +
    Results
    File nameCard numberResult
    [% filename.source %][% filename.cardnumber %] + [% IF ( filename.filerrors ) %] [% FOREACH filerror IN filename.filerrors %] - [% IF ( filerror.DBERR ) %]
    ERROR: Image not imported because the database returned an error. Please refer to the error log for more details. - [% ELSIF ( filerror.IMGEXISTS ) %]
    ERROR: Image not imported because this patron does not exist in the database. - [% ELSIF ( filerror.MIMERR ) %]
    ERROR: Image not imported because the image format is unrecognized. - [% ELSIF ( filerror.CORERR ) %]
    ERROR: Image not imported because the image file is corrupted. - [% ELSIF ( filerror.OPNERR ) %]
    ERROR: Image not imported because Koha was unable to open the image for reading. - [% ELSIF ( filerror.OVRSIZ ) %]
    ERROR: Image not imported because the image file is too big (see online help for maximum size). - [% ELSIF ( filerror.CRDFIL ) %]
    ERROR: Image not imported ([% filerror.CRDFIL %] missing). - [% ELSE %]
    ERROR: Image not imported because of an unknown error. Please refer to the error log for more details. + [% IF ( filerror.DBERR ) %]ERROR: Image not imported because the database returned an error. Please refer to the error log for more details. + [% ELSIF ( filerror.IMGEXISTS ) %]ERROR: Image not imported because this patron does not exist in the database. + [% ELSIF ( filerror.MIMERR ) %]ERROR: Image not imported because the image format is unrecognized. + [% ELSIF ( filerror.CORERR ) %]ERROR: Image not imported because the image file is corrupted. + [% ELSIF ( filerror.OPNERR ) %]ERROR: Image not imported because Koha was unable to open the image for reading. + [% ELSIF ( filerror.OVRSIZ ) %]ERROR: Image not imported because the image file is too big (see online help for maximum size). + [% ELSIF ( filerror.CRDFIL ) %]ERROR: Image not imported ([% filerror.CRDFIL %] missing). + [% ELSE %]ERROR: Image not imported because of an unknown error. Please refer to the error log for more details. [% END %] [% END %] [% ELSE %] imported successfully. - [% END %] - + [% END %]
    +
    [% END %] - -
- [% IF ( borrowernumber ) %] - Return to patron detail - [% ELSE %] - Upload more images - Return to tools - [% END %] +
[% ELSE %]
-
-

Upload patron images

[% IF ( ERRORS ) %]
@@ -122,8 +131,6 @@
[% END %] -
-
[% INCLUDE 'tools-menu.inc' %] -- 1.7.9.5 From ibu at radempa.de Fri Dec 21 09:06:34 2012 From: ibu at radempa.de (=?UTF-8?B?aWJ1IOKYiSByYWRlbXBhIOS3sA==?=) Date: Fri, 21 Dec 2012 09:06:34 +0100 Subject: [Koha-patches] debian package koha-common_3.10.00-1_all.deb / failing daily cronjob Message-ID: <50D4188A.30409@radempa.de> (Not sure, if this is the right place for debian packaging.) My upgrade from 3.8 to 3.10 using debian packages went flawlessly, except for an error in the daily cronjob: /etc/cron.daily/koha-common: [: 97: missing ] Thus please change line 61 in /usr/sbin/koha-run-backups from if [ -z "$dirname"]; then to if [ -z "$dirname" ]; then Thanks! From mjr at phonecoop.coop Fri Dec 21 12:43:06 2012 From: mjr at phonecoop.coop (MJ Ray) Date: Fri, 21 Dec 2012 11:43:06 +0000 Subject: [Koha-patches] debian package koha-common_3.10.00-1_all.deb / failing daily cronjob - Bug 9260 In-Reply-To: <50D4188A.30409@radempa.de> Message-ID: ibu ? radempa ? > My upgrade from 3.8 to 3.10 using debian packages went flawlessly, > except for an error in the daily cronjob: > > /etc/cron.daily/koha-common: > [: 97: missing ] > > Thus please change line 61 in /usr/sbin/koha-run-backups from > if [ -z "$dirname"]; then > to > if [ -z "$dirname" ]; then koha-devel might be better, but I've submitted the above as a patch, which you can find at http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9260 - I'm glad that you reached the same conclusion. I hope it will be included in the next package release. Thanks! -- MJ Ray (slef), member of www.software.coop, a for-more-than-profit co-op. http://koha-community.org supporter, web and library systems developer. In My Opinion Only: see http://mjr.towers.org.uk/email.html Available for hire (including development) at http://www.software.coop/ From nengard at bywatersolutions.com Tue Dec 25 07:37:04 2012 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Tue, 25 Dec 2012 01:37:04 -0500 Subject: [Koha-patches] [PATCH] Bug 9306: Update descriptions for the 4 SeparateHoldings prefs Message-ID: <1356417424-4489-1-git-send-email-nengard@bywatersolutions.com> --- .../en/modules/admin/preferences/cataloguing.pref | 4 ++-- .../prog/en/modules/admin/preferences/opac.pref | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index f2a16c6..7b9c354 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -161,9 +161,9 @@ Cataloging: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: SeparateHoldingsBranch choices: homebranch: 'home branch' holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + - "is the logged in user's library. The second tab will contain all other items." diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index c1870ad..02a3d62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -264,12 +264,12 @@ OPAC: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: OpacSeparateHoldingsBranch choices: homebranch: 'home branch' holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + - "is the logged in user's library. The second tab will contain all other items." Features: - - pref: opacuserlogin -- 1.7.2.3 From oleonard at myacpl.org Thu Dec 27 16:48:10 2012 From: oleonard at myacpl.org (Owen Leonard) Date: Thu, 27 Dec 2012 10:48:10 -0500 Subject: [Koha-patches] [PATCH] Bug 9323 [Counter-proposal] Untranslatable string in serials search Message-ID: <1356623290-18597-1-git-send-email-oleonard@myacpl.org> The translator seems to have a problem with the _() function inside HTML. Rather than move only the translatable string to the @@ -233,7 +235,7 @@ [% UNLESS subscription.cannotedit %] - Reopen + Reopen [% ELSE %] Cannot edit [% END %] -- 1.7.9.5 From Eric.Begin at inLibro.com Thu Dec 27 22:08:54 2012 From: Eric.Begin at inLibro.com (=?UTF-8?q?Eric=20B=C3=A9gin?=) Date: Thu, 27 Dec 2012 16:08:54 -0500 Subject: [Koha-patches] [PATCH] fix errors in updatedatabase for 3.6.11 Message-ID: <1356642534-11037-1-git-send-email-Eric.Begin@inLibro.com> --- installer/data/mysql/updatedatabase.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8b7d22e..56834e4 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3333,7 +3333,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { 'Email address to Bcc outgoing notices sent by email', 'free') "); -v print "Upgrade to $DBversion done (added OverdueNoticeBcc system preferences)\n"; + print "Upgrade to $DBversion done (added OverdueNoticeBcc system preferences)\n"; SetVersion ($DBversion); } $DBversion = "3.01.00.102"; @@ -4734,7 +4734,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $DBversion = "3.06.11.000"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - print "Upgrade to $DBversion done (Incrementing version for 3.6.10 release. See release notes for de$ + print "Upgrade to $DBversion done (Incrementing version for 3.6.11 release. See release notes for details.) \n"; SetVersion ($DBversion); } -- 1.7.9.5 From nengard at bywatersolutions.com Fri Dec 28 15:34:18 2012 From: nengard at bywatersolutions.com (Nicole C. Engard) Date: Fri, 28 Dec 2012 09:34:18 -0500 Subject: [Koha-patches] [PATCH] Bug 9306: Update descriptions for the 4 SeparateHoldings prefs Message-ID: <1356705258-2112-1-git-send-email-nengard@bywatersolutions.com> --- .../en/modules/admin/preferences/cataloguing.pref | 8 ++++---- .../prog/en/modules/admin/preferences/opac.pref | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index 09ec796..c3a3847 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -161,12 +161,12 @@ Cataloging: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: SeparateHoldingsBranch choices: - homebranch: 'home branch' - holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + homebranch: 'home library' + holdingbranch: 'holding library' + - "is the logged in user's library. The second tab will contain all other items." - - Don't show these - pref: NotesBlacklist diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index c1870ad..300c6e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -264,12 +264,12 @@ OPAC: choices: yes: Separate no: Don't separate - - 'items display into two tabs. First tab contains items whose' + - "items display into two tabs, where the first tab contains items whose" - pref: OpacSeparateHoldingsBranch choices: - homebranch: 'home branch' - holdingbranch: 'holding branch' - - 'is the branch of user logged in. The other tab contains other items.' + homebranch: 'home library' + holdingbranch: 'holding library' + - "is the logged in user's library. The second tab will contain all other items." Features: - - pref: opacuserlogin -- 1.7.2.3 From martin.renvoize at ptfs-europe.com Mon Dec 31 15:43:53 2012 From: martin.renvoize at ptfs-europe.com (Martin Renvoize) Date: Mon, 31 Dec 2012 14:43:53 +0000 Subject: [Koha-patches] [PATCH] Bug_8883: 'opacsmallimage' doesn't work in ccsr theme Message-ID: <1356965033-13975-1-git-send-email-martin.renvoize@ptfs-europe.com> --- koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc index d666113..b1bfb29 100644 --- a/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/ccsr/en/includes/masthead.inc @@ -77,7 +77,19 @@