From 22febf401ac62babc4c16677222b72aafca02b04 Mon Sep 17 00:00:00 2001 From: tipaul Date: Thu, 10 Oct 2002 14:37:03 +0000 Subject: [PATCH] merging auth from branch rel-1.2 --- .../en/includes/acquisitions-bottom.inc | 6 +- .../default/en/includes/acquisitions-top.inc | 299 ++++---- .../default/en/includes/cat-bottom.inc | 52 +- .../default/en/includes/cat-top.inc | 214 +++--- .../en/includes/circulation-bottom.inc | 50 +- .../default/en/includes/circulation-top.inc | 18 +- .../default/en/includes/issues-bottom.inc | 50 +- .../default/en/includes/issues-top.inc | 654 +++++++++--------- .../default/en/includes/members-bottom.inc | 50 +- .../default/en/includes/members-top.inc | 212 +++--- .../default/en/includes/opac-bottom.inc | 34 +- .../default/en/includes/opac-top.inc | 148 ++-- .../default/en/includes/reports-bottom.inc | 52 +- .../default/en/includes/reports-top.inc | 208 +++--- 14 files changed, 1025 insertions(+), 1022 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc index 0e8357bf79..44f1659b2b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-bottom.inc @@ -10,10 +10,10 @@
-Home || +Home || Circulation || -Catalogue || -Members || +Catalogue || +Members || Acquisitions || Reports || Help || diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc index 2b01f58d69..8aa3f42e56 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/acquisitions-top.inc @@ -1,150 +1,149 @@ - - - - - - - - -KOHA: INTRANET: Acquisitions - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- KOHA: Main Menu
-
- - -
- - - -Catalogue - -Members - -Acquisitions - -Reports - -Circulation - -Home - - - -
- + + + + + + + + +KOHA: INTRANET: Acquisitions + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +

+ KOHA: Main Menu
+
+ + +
+ + + +Catalogue + +Members + +Acquisitions + +Reports + +Circulation + +Home + + + +
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc index 67d8be5914..a4c3e24428 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-bottom.inc @@ -1,26 +1,26 @@ -
-

 

- - -
- - -
- - -
- -Home || -Circulation || -Catalogue || -Members || -Acquisitions || -Reports || -Help || -OPAC || -Library Website - -
- - - +
+

 

+ + +
+ + +
+ + +
+ +Home || +Circulation || +Catalogue || +Members || +Acquisitions || +Reports || +Help || +OPAC || +Library Website + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc index 90190bf4bf..17b50b3f49 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/cat-top.inc @@ -1,115 +1,115 @@ - + - - - -KOHA: INTRANET: Catalogue - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- KOHA: Main Menu
-
- - - -
-
- - - -Catalogue - -Members - -Acquisitions - -Reports + + + +KOHA: INTRANET: Catalogue + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +

+ KOHA: Main Menu
+
+ + + +
+
+ + + +Catalogue + +Members + +Acquisitions + +Reports Circulation -Home - +Home + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc index 67d8be5914..87df56da68 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-bottom.inc @@ -1,26 +1,24 @@ -
-

 

- - - - - -
- - -
- -Home || -Circulation || -Catalogue || -Members || -Acquisitions || -Reports || -Help || -OPAC || -Library Website - -
- - - +
+

 

+ + + + +
+ +
+ +Home || +Circulation || +Catalogue || +Members || +Acquisitions || +Reports || +Help || +OPAC || +Library Website + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc index b874272b5f..0ca1dfd067 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/circulation-top.inc @@ -84,10 +84,10 @@ onLoad=focusinput()>
- KOHA: Main Menu
+ KOHA: Main Menu
 - + @@ -97,7 +97,7 @@ onLoad=focusinput()> - +
@@ -107,22 +107,22 @@ onLoad=focusinput()> -Catalogue +Catalogue -Members +Members Acquisitions -Reports +Reports Circulation -Home +Home -
\ No newline at end of file +
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc index 82d5022fba..e2f06e4986 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/issues-bottom.inc @@ -1,25 +1,25 @@ -
-

 

- - -
- - -
- - -
- -Home || -Catalogue || -Members || -Acquisitions || -Reports || -Help || -OPAC || -Library Website - -
- - - +
+

 

+ + +
+ + +
+ + +
+ +Home || +Catalogue || +Members || +Acquisitions || +Reports || +Help || +OPAC || +Library Website + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc index 59c08efe46..8dc041f489 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/issues-top.inc @@ -1,327 +1,327 @@ - - - - - - -KOHA: INTRANET: Issues & Returns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- KOHA: HDL INTRANET
-
I 1    
- -
- -
-		 - - - -
- -
-		 - - - -
- -
- -		 - - -
- -
-		 - -
- -
-
  - - - - - -

- you are in ISSUES & RETURNS
-
-
+ + + + + + +KOHA: INTRANET: Issues & Returns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +

+ KOHA: HDL INTRANET
+
I 1    
+ +
+ +
+		 + + + +
+ +
+		 + + + +
+ +
+ +		 + + +
+ +
+		 + +
+ +
+
  + + + + + +

+ you are in ISSUES & RETURNS
+
+
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc index 67d8be5914..601a3c6035 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-bottom.inc @@ -1,26 +1,24 @@ -
-

 

- - -
- - -
- - -
- -Home || -Circulation || -Catalogue || -Members || -Acquisitions || -Reports || -Help || -OPAC || -Library Website - -
- - - +
+

 

+ + +
+ + +
+ + + +Home || +Catalogue || +Members || +Acquisitions || +Reports || +Help || +OPAC || +Library Website + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc index 1376ea7bf3..28d2759f02 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/members-top.inc @@ -1,106 +1,106 @@ - - - - - - - - - -KOHA: INTRANET: Members - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- KOHA: Main Menu
-
- - -
- - - -Catalogue - -Members - -Acquisitions - -Reports - -Circulation - -Home - - - -
+ + + + + + + + + +KOHA: INTRANET: Members + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +

+ KOHA: Main Menu
+
+ + +
+ + + +Catalogue + +Members + +Acquisitions + +Reports + +Circulation + +Home + + + +
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc index 16aff87c79..0607e8598d 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/opac-bottom.inc @@ -1,17 +1,17 @@ -
- -

 

-
-
- - - -Catalogue Search || - -Become a Member || -Home - - -
- - +
+ +

 

+
+
+ + + +Catalogue Search || + +Become a Member || +Home + + +
+ + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc index 85756f3cdb..8c37553b84 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/opac-top.inc @@ -1,70 +1,78 @@ - - - - - -KOHA: OPAC Catalogue Search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KOHA: Catalogue SearchSearch - - - Join - - Home
KOHA
- - - - -
+ + + + + +KOHA: OPAC Catalogue Search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
KOHA: Catalogue SearchSearch + + + + + My Settings + + + Join + + + Home
KOHA
+ + + + +
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc b/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc index 2ae4effcf1..261b909fb2 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/reports-bottom.inc @@ -1,26 +1,26 @@ -
-

 

- - -
- - -
- - -
- -Home || -Circulation || -Catalogue || -Members || -Acquisitions || -Reports || -Help || -OPAC || -Library Website - -
- - - +
+

 

+ + +
+ + +
+ + +
+ +Home || +Circulation || +Catalogue || +Members || +Acquisitions || +Reports || +Help || +OPAC || +Library Website + +
+ + + diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc index 4dd9dc8e47..5bdf55169b 100644 --- a/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc +++ b/koha-tmpl/intranet-tmpl/default/en/includes/reports-top.inc @@ -1,104 +1,104 @@ - - - - - - - -KOHA: INTRANET: Reports - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -

- KOHA: Main Menu
-
- - -
- - - -Catalogue - -Members - -Acquisitions - -Reports - -Circulation - -Home - - - - -
+ + + + + + + +KOHA: INTRANET: Reports + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +

+ KOHA: Main Menu
+
+ + +
+ + + +Catalogue + +Members + +Acquisitions + +Reports + +Circulation + +Home + + + + +
-- 2.39.2