From: Owen Leonard Date: Tue, 2 Oct 2007 20:01:29 +0000 (-0500) Subject: More work to toolbars and menus. Adding experimental YUI-based toolbar to detail... X-Git-Tag: v3.00.00-alpha~1609 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=78df55c5a54016f50afce040535a2b4b0458cb06;p=koha_fer More work to toolbars and menus. Adding experimental YUI-based toolbar to detail.tmpl. Adding dashboard-style layout to tools-home.tmpl. Correcting markup in request.tmpl. Adding patron information variables to request.pl for display in holds-menu.inc. Signed-off-by: Chris Cormack --- 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 2153966d93..a89ba5d4ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -106,6 +106,10 @@ li { list-style-type : disc; } +li li { + list-style-type : circle; +} + #header { background-color : #F3F3F3; border-bottom : 1px solid #E8E8E8; @@ -180,7 +184,7 @@ table { td, th { border-bottom : 1px solid #BCBCBC; border-left : 1px solid #BCBCBC; - padding : .5em; + padding : .2em .3em; } td { @@ -240,7 +244,7 @@ div#header_search { background-repeat : no-repeat; float: left; padding-left : 14.2em; - margin: 1em 0 1.5em 0; + margin: .3em 0 .5em 0; } div#header_search input { @@ -679,4 +683,8 @@ fieldset.rows fieldset.action { .checkedout { color : #999999; font-style : italic; +} + +.subfield_not_filled { + background-color : #FFFF99; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc deleted file mode 100644 index 3f8c62afe7..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc +++ /dev/null @@ -1,13 +0,0 @@ - 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 index 5e8165135a..0ff4b9eb7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -1,7 +1,9 @@ - + + + + +
-

items

+ item(s) @@ -187,7 +270,10 @@ function confirm_deletion(count) {

No physical items for this record

+ + +

This is a serial subscription

(We have subscriptions associated with this title).

@@ -227,6 +313,7 @@ function confirm_deletion(count) {
+
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 9c70749620..2b10f53d29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl @@ -14,6 +14,7 @@
+
@@ -81,6 +82,7 @@ NAME="biblionumber"-->&itemnumber=">Modif
+
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 2656fd5828..d0bc2c5ed1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -105,17 +105,18 @@ if (alreadyreserved > "0"){
" method="post" onsubmit="request.pl" name="getborrower"> +
(type card number or part of a name)
" /> +
" /> - @@ -291,9 +292,15 @@ if (alreadyreserved > "0"){ - + + + @@ -307,12 +314,12 @@ if (alreadyreserved > "0"){ - Item waiting at /> + Item waiting at " /> Waiting to be pulled - Item being transfered to /> + Item being transfered to " />
Item type
-
+
@@ -360,7 +367,7 @@ if (alreadyreserved > "0"){
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl index fc0ca617a0..cd07499f27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl @@ -8,50 +8,50 @@ -
- -
-
-
- -

Koha tools

+
+
+
+
+
News
+
Write news for the OPAC and staff interfaces.
+
Label creator
Create printable labels and barcodes from catalog data.
Holidays
Define holidays (days where the library is closed)
- +
+
+
+
Export
Export data
+
Inventory/stocktaking
+
Perform inventory (stocktaking) of your catalogue
+
Reservoir Import
Import data into the reservoir.
- -
News
-
Write news for the OPAC and staff interfaces.
- +
+
+
+
Notices
Define notices (print and email notification messages for overdues, etc.)
Overdue rules
Rules for overdue books
-
Inventory/stocktaking
-
Perform inventory (stocktaking) of your catalogue
-
Clean borrowers
Delete old borrowers and anonymize circulation history (deletes borrower reading history)
Log viewer
Browse the system logs
-
-
-
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif b/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif new file mode 100644 index 0000000000..6aa552dfcc Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif differ diff --git a/reserve/request.pl b/reserve/request.pl index fd40aaed14..90ca398c56 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -119,6 +119,12 @@ if ($cardnumber) { borrowernumber => $borrowerinfo->{'borrowernumber'}, borrowersurname => $borrowerinfo->{'surname'}, borrowerfirstname => $borrowerinfo->{'firstname'}, + borrowerstreetaddress => $borrowerinfo->{'address'}, + borrowercity => $borrowerinfo->{'city'}, + borrowerphone => $borrowerinfo->{'phone'}, + borroweremail => $borrowerinfo->{'email'}, + borroweremailpro => $borrowerinfo->{'emailpro'}, + borrowercategory => $borrowerinfo->{'category'}, borrowerreservs => $count_reserv, maxreserves => $maxreserves, expiry => $expiry,