From 3fb1875a81a4232efeb401c7d7072a8f15366738 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 4 Sep 2007 11:38:31 -0500 Subject: [PATCH] Cleanup of catalogue files, previously excluded from layout fixes. Some bugs may still remain due to script errors in my installation (results.tmpl, MARCdetail.tmpl, ISBDdetail.tmpl) Signed-off-by: Chris Cormack --- .../prog/en/includes/action-catalogue.inc | 65 +++------ .../prog/en/modules/catalogue/ISBDdetail.tmpl | 14 +- .../prog/en/modules/catalogue/MARCdetail.tmpl | 136 ++++++++++-------- .../prog/en/modules/catalogue/advsearch.tmpl | 51 +++---- .../prog/en/modules/catalogue/detail.tmpl | 96 +++++++------ .../prog/en/modules/catalogue/dictionary.tmpl | 15 +- .../en/modules/catalogue/issuehistory.tmpl | 95 +++++------- .../prog/en/modules/catalogue/moredetail.tmpl | 28 ++-- .../prog/en/modules/catalogue/results.tmpl | 13 +- .../prog/en/modules/catalogue/subject.tmpl | 16 ++- .../prog/en/modules/catalogue/suggest.tmpl | 13 +- .../virtualshelves/addbybiblionumber.tmpl | 12 +- .../en/modules/virtualshelves/shelves.tmpl | 86 ++++++----- 13 files changed, 337 insertions(+), 303 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc index d13b0f9ea3..6195e317db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc @@ -1,57 +1,30 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl index 011d4739d8..6a33472fd4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl @@ -4,9 +4,14 @@ - + +
+ +
+
+

MARC biblio :

@@ -45,4 +50,9 @@ function confirm_deletion(count) { - +
+
+
+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl index d83a1fec74..d0ab82ae82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl @@ -1,17 +1,73 @@ Koha › Catalogue MARC Detail + - + +
+ +
+
+
-

- MARC biblio : -

+

MARC biblio :

@@ -79,6 +135,7 @@

+
@@ -110,6 +167,7 @@

+
@@ -140,6 +198,7 @@

+ @@ -170,6 +229,7 @@

+ @@ -200,6 +260,7 @@

+ @@ -230,6 +291,7 @@

+ @@ -260,6 +322,7 @@

+ @@ -290,6 +353,7 @@

+ @@ -320,6 +384,7 @@

+ @@ -350,15 +415,15 @@

+
-
- +
- @@ -370,57 +435,10 @@
+
- - + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl index 998c73d9d1..1f227f38bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl @@ -1,13 +1,34 @@ Koha › Catalogue › Advanced Search + - + + + +
+
+
+
-
+
+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl index 0b131c114a..7af17a33b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl @@ -4,73 +4,55 @@ - + -

Issue history for ()

+
+ +
+
+
+ +

Issue history for ()

-
- Has been issued times +

Has been issued times

- - - - - - - + + + + + + + - - + - + - + - + - + - + + +
- Date - - Surname - - Firstname - - Issuing branch - - Renew - - Date due - - Return date -
DateSurnameFirstnameIssuing branchRenewDate dueReturn date
- +   - - - + ">   - - - +   - - - +   - - - + YES
@@ -79,29 +61,30 @@ NO - - 		- +   - - - +   - -
-
- () has never been issued. +

+ () has never been issued.

- +
+
+
+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl index f24c20b6d5..2612f31441 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -4,11 +4,16 @@ - + +
+ +
+
+
+
- -
-

BARCODE

+

BARCODE

&itemnumber=">Modify | &itemnumber=">Delete @@ -68,12 +71,15 @@ NAME="biblionumber"-->&itemnumber=">Modif Issues:
Group Number:
Biblio number:
- -
-

-

- - +
+ + +
+
+
+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index a4d382e42c..5d2bbbee62 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -3,9 +3,15 @@ - + +
+ +
+
+
+
Did you mean:
    @@ -378,7 +384,10 @@ + +
- + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl index b6582cc246..48365d05cf 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl @@ -4,9 +4,15 @@ - + +
+ +
+
+
+

Subject search results

@@ -28,4 +34,10 @@

&startfrom=">Previous Records &startfrom=">Next Records

- + +
+
+
+ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl index 6dc53cbfbe..ac1ae2b389 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/suggest.tmpl @@ -4,6 +4,13 @@ + +
+ +
+
+
+ @@ -36,5 +43,9 @@ } - + + + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl index 8b86f77bf3..761f2047c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tmpl @@ -1,15 +1,15 @@ Koha › Add to Virtual Shelf + - -
- +
-
-
+

Add @@ -50,9 +50,7 @@ -

- diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index 16dafec454..64f1b42f1b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -1,6 +1,44 @@ Koha › Virtual Shelves + @@ -69,8 +107,8 @@
Catalog Search
-
- This shelf is empty. + +

This shelf is empty.

" /> @@ -92,7 +130,6 @@ -
@@ -165,7 +202,7 @@ -
+

@@ -230,43 +267,4 @@ - - - + \ No newline at end of file -- 2.20.1
Add an item to this shelf by barcode