--- .../prog/en/css/staff-global.css | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 2 + .../prog/en/includes/serials-menu.inc | 6 + .../prog/en/includes/serials-search.inc | 30 +++++ .../modules/serials/acqui-search-result.tmpl | 7 +- .../prog/en/modules/serials/acqui-search.tmpl | 9 +- .../en/modules/serials/checkexpiration.tmpl | 18 ++- .../prog/en/modules/serials/claims.tmpl | 17 ++- .../en/modules/serials/distributedto.tmpl | 27 ++--- .../en/modules/serials/member-search.tmpl | 20 ++-- .../prog/en/modules/serials/result.tmpl | 8 +- .../modules/serials/routing-preview-slip.tmpl | 17 ++- .../en/modules/serials/routing-preview.tmpl | 12 +- .../prog/en/modules/serials/routing.tmpl | 14 ++- .../modules/serials/serial-issues-full.tmpl | 56 +++++---- .../en/modules/serials/serial-issues.tmpl | 13 ++- .../modules/serials/serials-collection.tmpl | 58 +++++----- .../prog/en/modules/serials/serials-edit.tmpl | 22 ++-- .../prog/en/modules/serials/serials-home.tmpl | 41 ++----- .../en/modules/serials/serials-recieve.tmpl | 107 ++++++++---------- .../en/modules/serials/subscription-add.tmpl | 24 ++-- .../serials/subscription-bib-search.tmpl | 4 +- .../modules/serials/subscription-detail.tmpl | 12 +- .../modules/serials/subscription-renew.tmpl | 10 +- .../prog/en/modules/serials/viewalerts.tmpl | 12 +- serials/routing.pl | 4 +- 26 files changed, 292 insertions(+), 260 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc 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 69972c0afb..7b81c50ca4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -254,7 +254,7 @@ div#header_search ul.link-tabs li.off a { padding : 0.1em .5em .2em .5em; } -div#circ_search,div#catalog_search,div#patron_search { +div#circ_search,div#catalog_search,div#patron_search,div#subscription_search { border : 0; border-bottom : 1px solid #FF9900; padding : 0 0 .2em 0; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index e2542fac91..42e4441c08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -8,6 +8,8 @@

Cataloguing
Acquisitions
Authorities
Serials
Reports
Tools
Administration

Search Subscriptions:

+ +

Enter patron card number or partial name:

+ +

Enter search keywords:

+ +

Supplier Search Results

You searched on supplier , results found

@@ -35,11 +35,8 @@ function GetIt(aqbooksellerid,name) -

Perform a new search

- -

Koha › Serials › Search for Supplier

Search supplier for serial subscription

@@ -26,7 +27,5 @@ function GetIt(aqbooksellerid,name)

Koha › Serials Expiration

Select borrowers or enter manually the names

- +

+ +

- 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 3e632b6077..78462bbbff 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 @@ -19,31 +19,32 @@ function add_member(subscriptionid,borrowernumber){

Member Search

- - +

Name

+ + - + + -

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

- +

@@ -53,7 +54,6 @@ NAME="subscriptionid" -->,); return false

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl index f72aaa7ef7..e78d868efc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/result.tmpl @@ -2,7 +2,7 @@ Koha › Search Results

Search results

@@ -53,10 +54,7 @@ function GetIt(bibno,title) No result found for -

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl index 19aa69c4f4..2df1f5cbae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl @@ -10,17 +10,17 @@

+ - - -

Title:
+ + + - - + + - - + +


Title:
Name/Location	Date Due
Name/Location	Date Due

Notes: Please return this journal @@ -31,6 +31,5 @@ promptly as others are waiting. - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl index df400931be..63927030ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview.tmpl @@ -14,13 +14,13 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes'); - +

Preview Routing List

@@ -48,9 +48,11 @@ window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');

- - +

+ +

+ \ No newline at end of file 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 bebe93be91..9faa826eb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl @@ -18,13 +18,13 @@ function search_member(subscriptionid){ - +

@@ -41,7 +41,7 @@ function search_member(subscriptionid){ @@ -80,9 +80,11 @@ href="/cgi-bin/koha/serials/routing.pl?subscriptionid= - +

+ +

+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl index 39958188a5..dc619b66b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues-full.tmpl @@ -1,7 +1,34 @@ - - + +Koha › Serials › Subscription information for biblio # with title :  + + + + + + +

+ +

Subscription information for biblio # with title :

" class="button serial">Back to biblio @@ -48,21 +75,12 @@

- - - +

+ +

+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl index d76326e92c..c8b990dec4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serial-issues.tmpl @@ -4,20 +4,19 @@ - +

Subscription information for

">Subscriptions ">Back to biblio &selectview=full">Complete view -

"> @@ -111,9 +110,11 @@ -

- - +

+ +

+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl index 061fd647ea..f4d7e2d50a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl @@ -1,7 +1,8 @@ Koha › Serials - - +

Serial Collection information for

@@ -164,25 +172,20 @@ function popup(subscriptionid) { -

- + + +

- - -

" class="content_visible" > - -

" class="content_hidden"> - +

"> @@ -205,7 +208,7 @@ function popup(subscriptionid) { - "> + @@ -232,18 +235,18 @@ function popup(subscriptionid) { - - - - " /> - - - - - - - - + @@ -156,12 +138,11 @@ Serials updated : -

+ " /> " disabled="disabled" /> - " /> + " /> - " /> + " /> - " /> + " /> " /> @@ -259,12 +262,15 @@ function popup(subscriptionid) { " /> + + - - +

+ +

+ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl index 2a8d37f03d..76354d7baa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tmpl @@ -2,7 +2,7 @@ Koha › Serials - +

Serial Edition

" title="serial Collection for ">Serial collection

" title="serial Collection for ">Serial collection
" title="detail of the subscription">Subscription #
&mode=popup')">Renew

Numbered	Published on	- "> @@ -321,9 +323,11 @@ Error : Barcode Not Unique For serialseq - - - + + + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl index 69b821704a..0616b37883 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl @@ -4,13 +4,13 @@ - + - + Serials updated : @@ -53,8 +53,9 @@ Serials updated :

Serials subscription

Search existing subscription

Serials subscriptions

Search for Serial Routing List

- " title="type ISSN here to filter subscription" /> -

- " title="type a title -complete or partial- to filter subscription" /> -

- -

+ -

Add a new subscription

Add subscription @@ -170,7 +151,9 @@ Serials updated :

- - +

+ +

+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl index 37ce9c3b16..6ff155a188 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-recieve.tmpl @@ -2,7 +2,7 @@ Koha › Serials - +

Check In subscription for:

@@ -62,49 +63,39 @@ function barcode_check(){

waited or late numbers

- - "> - "> - "> - + + " /> + " /> + " /> +

- - - - - + + + + +

- Numbered -	- Published on -	- planned for -	- Status -	- Notes -	Numbered	Published on	planned for	Status	Notes
- Issue " size="20" maxlength="100"> + Issue " size="20" maxlength="100" /> - Callnumber " size="15" maxlength="100"> - Barcode " id="barcode" size="20" maxlength="20"> + Callnumber " size="15" maxlength="100" /> + Barcode " id="barcode" size="20" maxlength="20" />	- " size="10" maxlength="15"> + " size="10" maxlength="15" />	- " size="10" maxlength="15"> + " size="10" maxlength="15" /> - @@ -115,8 +106,8 @@ function barcode_check(){	- "> - " /> + +	- " size="20" maxlength="255"> + " size="20" maxlength="255" /> - @@ -201,24 +192,24 @@ function barcode_check(){
- Manual issue "> + Manual issue " /> - Callnumber - Barcode + Callnumber + Barcode	- " size="10" maxlength="15"> + " size="10" maxlength="15" />	- "> + " /> - @@ -231,11 +222,11 @@ function barcode_check(){	- "> + " /> - + - @@ -265,7 +256,7 @@ function barcode_check(){ - @@ -286,7 +277,7 @@ function barcode_check(){ - @@ -304,7 +295,7 @@ function barcode_check(){

- +

Subscription has expired.

Waited last issue status can't be changed. Renew your subscription

@@ -321,28 +312,28 @@ function barcode_check(){

Subscription summary

- - "> - "> - "> + + " /> + " /> + " />

Librarian

Starting date:"> (the date of the 1st subscription)

Ending date:">(if empty : subscription still active)

Starting date:" /> (the date of the 1st subscription)

Ending date:" />(if empty : subscription still active)

Recieved issues

Missing issues

Opac's note

+ \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl index 3348626966..31195d1d10 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl @@ -1,15 +1,7 @@ Koha › Serials - -/lib/calendar/calendar-system.css" /> - - - - - - - + + //]]> +

Subscription renewal for

@@ -26,7 +26,7 @@

Number of weeks" />

Number of months" />

Note for the librarian that will manage your renewal request

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl index 30bf63a1fe..d5b1976399 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tmpl @@ -4,13 +4,13 @@ - +

Alert subscribers for

" class="button">subscription @@ -33,7 +33,9 @@

- - +

+ +

+ \ No newline at end of file diff --git a/serials/routing.pl b/serials/routing.pl index 0afa519b4a..c612a78d93 100755 --- a/serials/routing.pl +++ b/serials/routing.pl @@ -114,9 +114,9 @@ for(my $i=0;$i<$routing;$i++){ for(my $j=1; $j <= $routing; $j++) { $rankingbox .= ""; + $rankingbox .= " value=\"$j\">$j"; } $rankingbox .= ""; $data->{'routingbox'} = $rankingbox; -- 2.20.1