From 21b08b3b20fd3062f35d3b9281533b727d6ea4a6 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 29 Sep 2007 10:15:25 -0500 Subject: [PATCH] General work on menus and toolbars, as well as some minor terminology changes on some pages. Signed-off-by: Chris Cormack --- .../prog/en/includes/action-catalogue.inc | 27 ++++--------------- .../prog/en/includes/biblio-view-menu.inc | 9 +++++++ .../prog/en/includes/cat-menu.inc | 8 ------ .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../prog/en/includes/serials-menu.inc | 21 +++++++++++++-- .../prog/en/includes/serials-toolbar.inc | 10 +++++++ .../prog/en/modules/catalogue/MARCdetail.tmpl | 3 ++- .../prog/en/modules/catalogue/detail.tmpl | 5 ++-- .../prog/en/modules/reserve/request.tmpl | 4 ++- .../modules/serials/serials-collection.tmpl | 1 + .../modules/serials/subscription-detail.tmpl | 22 ++------------- 11 files changed, 54 insertions(+), 58 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc 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 6195e317db..3f8c62afe7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc @@ -1,30 +1,13 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc new file mode 100644 index 0000000000..5e8165135a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc index 9419ea2e45..7933c1ce11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc @@ -1,11 +1,3 @@ - -
-
- -
- - \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 42e4441c08..e25b1a92e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -17,4 +17,4 @@ -
| Log Out | You are not logged in | [ ? ]
+
(Set) | (Log Out) | You are not logged in | [ ? ]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc index d3192e741d..1aeca8c6a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc @@ -1,6 +1,23 @@ + + + + + + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc new file mode 100644 index 0000000000..8fa89edc97 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -0,0 +1,10 @@ + \ 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 3b3a4e940c..d69a39d726 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl @@ -67,11 +67,11 @@ function Addbiblio(op) {
+

MARC biblio :

- @@ -441,6 +441,7 @@ function Addbiblio(op) {
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl index a88c09c313..a0ad2647ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -47,10 +47,8 @@ function confirm_deletion(count) {
-

Biblio detail

+

- - [ @@ -234,6 +232,7 @@ function confirm_deletion(count) {

+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl index 203911cab6..2656fd5828 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -141,7 +141,7 @@ if (alreadyreserved > "0"){

- Operation Failed + Warning: This patron already has a hold on this item

@@ -268,6 +268,7 @@ if (alreadyreserved > "0"){ +
" action="modrequest.pl" method="post">
@@ -354,6 +355,7 @@ if (alreadyreserved > "0"){
+ 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 9fe8599d59..02cceb55c9 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 @@ -75,6 +75,7 @@ $(document).ready(function() { +

Serial Collection information for

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index 69b6a5d9e3..5491a808d7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -104,29 +104,11 @@ function popup(subscriptionid) {
- +

Subscription #

Subscription is by its end. It should be renewed now.
- +

Subscription information

-- 2.20.1