From 1eb4513d43c493484259719661b180f1174d9a04 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 20 Oct 2007 16:42:06 -0500 Subject: [PATCH] Standardizing YUI toolbar Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 6 +- .../prog/en/includes/acquisitions-toolbar.inc | 34 +++++-- .../prog/en/includes/authorities-toolbar.inc | 34 ++++++- .../prog/en/includes/cat-toolbar.inc | 49 +++++++++- .../prog/en/includes/circ-toolbar.inc | 84 +++++++++++++--- .../prog/en/includes/members-menu.inc | 11 +-- .../prog/en/includes/yui-toolbars.inc | 12 +++ .../prog/en/modules/acqui/acqui-home.tmpl | 3 +- .../prog/en/modules/acqui/booksellers.tmpl | 10 +- .../prog/en/modules/acqui/supplier.tmpl | 7 +- .../modules/authorities/authorities-home.tmpl | 5 +- .../en/modules/authorities/authorities.tmpl | 6 +- .../authorities/searchresultlist-auth.tmpl | 7 +- .../modules/authorities/searchresultlist.tmpl | 96 +++++++++++++++---- .../prog/en/modules/catalogue/ISBDdetail.tmpl | 3 +- .../prog/en/modules/catalogue/MARCdetail.tmpl | 3 +- .../prog/en/modules/catalogue/detail.tmpl | 57 +---------- .../prog/en/modules/catalogue/moredetail.tmpl | 3 +- .../prog/en/modules/circ/circulation.tmpl | 16 ++-- .../en/modules/circ/selectbranchprinter.tmpl | 23 ++--- .../prog/en/modules/members/moremember.tmpl | 3 +- 21 files changed, 316 insertions(+), 156 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.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 dc6ca1fed2..ba830d54c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1,4 +1,4 @@ -@import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all; +@import url("/intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css"); a, a:link, a:visited, a:active { color : #0000CC; @@ -718,14 +718,14 @@ fieldset.rows .inputnote { visibility:visible; /* you propably don't need to change this one */ display:block; } -#addbiblio a { +#addbiblio a, #addchild a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-new.gif"); background-position : center left; background-repeat : no-repeat; } -#deletebiblio a { +#deletebiblio a, #deletepatron a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif"); background-position : center left; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc index 8be2bd4c5a..2af4b5d201 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-toolbar.inc @@ -1,12 +1,32 @@ -
+
-
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 03d0d37155..0a101aefb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -1,6 +1,36 @@
+ + +
-
+
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index 0e785f4f59..c63b6f4f55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,10 +1,53 @@
+ + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc new file mode 100644 index 0000000000..d299270d23 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/yui-toolbars.inc @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl index 23fae053ca..11be41264c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tmpl @@ -1,8 +1,9 @@ Koha › Acquisitions + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl index 8a708aa444..1dbf2632ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tmpl @@ -1,12 +1,13 @@ -Koha › Search for supplier <!-- TMPL_VAR name="bookselname" --> +Koha › Search for supplier <!-- TMPL_VAR name="supplier" --> + - + - +
@@ -76,9 +77,6 @@
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl index 46bb6d0c62..48ff52facf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl @@ -1,6 +1,7 @@ Koha › Supplier <!-- TMPL_VAR name="bookselname" --> + - + - +
@@ -23,7 +24,7 @@ function confirm_deletion() {
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl index 5b143099ab..8bb16b4a53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl @@ -1,7 +1,9 @@ Koha › Authorities + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl index af9bb264a3..32559ac748 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tmpl @@ -1,5 +1,5 @@ -Koha -- Authority details +Koha › Authorities › <!-- TMPL_IF name="authid" -->Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)<!-- TMPL_ELSE -->Adding authority (<!-- TMPL_VAR name="authtypetext" -->)<!-- /TMPL_IF --> - - - - - + + + + + -
+
-
+
+ +

Authority search results

+

- Results to of - - No results found. -

@@ -83,9 +83,73 @@ function searchauthority() {
-
+ + No results found. + + +
- 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 ef7e7ff358..b45473b87c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl @@ -1,6 +1,7 @@ Koha › Catalogue › ISBD Details for <!-- TMPL_VAR NAME="title" --> + - + 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 9f3f3e2c25..6ff29aaf95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl @@ -1,6 +1,7 @@ Koha › Catalogue › MARC Details for <!-- TMPL_VAR NAME="title" --> + - + 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 2fbb646899..88007d2ee0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl @@ -1,21 +1,7 @@ Koha › Catalogue › Details for <!-- TMPL_VAR NAME="title" --> - - - - - - - - - - - - - - - + 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 a026e400a6..5dccc38984 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -1,8 +1,9 @@ Koha › Catalogue › Item details for <!-- TMPL_LOOP NAME="BIBITEM_DATA" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP --> + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl index 0e4a561c7a..209d8ee53f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -5,6 +5,7 @@ () + - + @@ -33,13 +34,9 @@
- - - - | Printer: --> @@ -741,10 +738,10 @@ No patron matched - + - + "> @@ -752,8 +749,7 @@ No patron matched
Hold dateBarcodeStatus Title AuthorLocalisationCall Number
- - &type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"> + Hold priority : @@ -761,7 +757,7 @@ No patron matched - ( ) + "> ( )
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl index 5baab3ba3c..4c95424b7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tmpl @@ -8,19 +8,19 @@ -
+
-
+
-

Set Library

-
- +
+ Set Library +
  1. +
  2. - +
  3. +
  4. - - +
+
-
- -
\ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl index dbe7fd7051..52f256ab8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -1,6 +1,7 @@ Koha › Patrons › <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --> + - + -- 2.39.5