From 1b1972044c7de0e33d8396632d989857eae669be Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 11 Dec 2009 10:01:46 -0500 Subject: [PATCH] Fix for Bug 3905 (Serial routing list add patron popup pagination broken) This patch also includes formatting fixes and style updates. The patron search filter form is incorporated now within serials/member-search.tmpl in order to have a markup structure more suited to the pop-up. --- .../prog/en/css/staff-global.css | 20 +++- .../prog/en/modules/members/search.tmpl | 1 + .../en/modules/serials/member-search.tmpl | 106 ++++++++++-------- .../prog/en/modules/serials/routing.tmpl | 2 +- serials/member-search.pl | 2 +- 5 files changed, 78 insertions(+), 53 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index ee789053e0..2cb528ed26 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1432,19 +1432,35 @@ div.pages a { text-decoration: none; } -div.pages a:link { +div.pages a:link, +div.pages a:visited { background-color : #eeeeee; color : #3366CC; } div.pages a:hover { - background-color : #e8f0f6; + background-color : #FFC; } div.pages a:active { background-color : #ffc; } +div.pages .current, +div.pages .currentPage { + background-color : #e6fcb7; + color : #666; + font-weight: bold; + padding: 1px 5px 1px 5px; +} + +div.pages .inactive { + background-color : #f3f3f3; + color : #BCBCBC; + font-weight: bold; + padding: 1px 5px 1px 5px; +} + div.browse { margin : .5em 0; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl index 2baecf3974..00f5b6506f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/search.tmpl @@ -1,4 +1,5 @@

" method="get"> +

Filter :

" /> " />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl index cf6b4b3e67..f6e2f0e588 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/member-search.tmpl @@ -12,64 +12,72 @@ function add_member(subscriptionid,borrowernumber){ //--> -

- -

- - -

Results to of found for ''''

+ " method="get"> +

+ Filter : +

Name: " /> + " />
Library :
Category:

+ +

Results to of found for ''''

- - - - - - - - - - - - - - - - - - -

Card	Name	Library	Add
			,); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=&borrowernumber=&op=add">Add

+ + + + + + + + + + + + + + + + + + +

Card	Name	Library	Add
	,		,); return false" href="/cgi-bin/koha/serials/routing.pl?subscriptionid=&borrowernumber=&op=add">Add

- -

No results found

- + +

No results found

- -

+ +

- -

- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl index 67df5c177c..4e9dd11303 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl @@ -10,7 +10,7 @@ function reorder_item(sid,rid,rank){ } function search_member(subscriptionid){ - var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=500,height=400,toolbar=no,scrollbars=yes'); + var myurl = 'member-search.pl?subscriptionid='+subscriptionid; window.open(myurl,'FindAMember','width=550,height=480,toolbar=no,scrollbars=yes'); } //--> diff --git a/serials/member-search.pl b/serials/member-search.pl index 6f517da8d3..6e26a0727d 100755 --- a/serials/member-search.pl +++ b/serials/member-search.pl @@ -126,7 +126,7 @@ my %parameters= , 'resultsperpage' => $resultsperpage , 'type'=> 'intranet'); my $base_url = - 'member.pl?&' + 'member-search.pl?&' . join( '&', map { "$_=$parameters{$_}" } (keys %parameters) -- 2.39.5