From 78df55c5a54016f50afce040535a2b4b0458cb06 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 2 Oct 2007 15:01:29 -0500 Subject: [PATCH] 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 --- .../intranet-tmpl/prog/en/css/staff-global.css | 12 +- .../prog/en/includes/action-catalogue.inc | 13 -- .../prog/en/includes/biblio-view-menu.inc | 6 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 17 ++ .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../intranet-tmpl/prog/en/includes/hold-menu.inc | 39 +++++ .../prog/en/modules/catalogue/ISBDdetail.tmpl | 2 + .../prog/en/modules/catalogue/MARCdetail.tmpl | 2 +- .../prog/en/modules/catalogue/detail.tmpl | 173 ++++++++++++++++----- .../prog/en/modules/catalogue/moredetail.tmpl | 2 + .../prog/en/modules/reserve/request.tmpl | 19 ++- .../prog/en/modules/tools/tools-home.tmpl | 38 ++--- koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif | Bin 0 -> 979 bytes reserve/request.pl | 6 + 14 files changed, 244 insertions(+), 87 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif 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 0000000000000000000000000000000000000000..6aa552dfccea5dc3af90932cf192568b07cf34cc GIT binary patch literal 979 zcmV;^11$VUNk%w1VH5yZ0-^-~0002Y%*-@ys{jB0|NqSY|Nj6000000A^8LW000F5 zEC2ui02BaN0ssU5Si0Q)Fv>}*y*TTgh5te&5F{Cj<%ycus9LV}UNdLkc&_h!@BhG{ zaHs$ojSkmf$y^EoHD#0eNfHE8>eY(P4q^>y7R(S&$&1nTsE(H2aQB+M4V#PsXuW&~ z<xzN8+w9>2fAo4usOAHut`nwZd*kJHrE*4NlQ9tEIDA!=|eVc(oV z-`wcu5d;P7?(Gui^5{3)-Q(QhDc;=WI`;ky<$@}-8M zJ6{Tx$v8*9$h4``r%(m9@VH_rgf=2R2%1QcYDt1tTaK(cRbxD_6i7y0%eJlCw@xKW zd;k*Q8m@izUFCTv9=N^}irx+Ucktetfa#_X9F}E2!*tcog-f}z<;!~y;nf#5j$SKo zj#~UnT5TGkizo9Ev<=)P{yLU&buJ#^a);P*hM_Qu_Z79TMt{i68A3tp2R zd*<5z-vuZjWt05}Oo0ZCXIdKJDFzl-)I|s(O@QzbAy8LQh@oN^R(M*6<>donXCqG7 zp@|eu#N2=^w#X17X;~K-3FLj2VU0F&*ivx=$+#JfAvTwoU$eEaU{*XvmLxweHtA%O zFwQuilpF<_4|(>TWrUTh@yHXFF}{XmlrS8bmYIYtiO-X4w&|ueGoTsB9#}b8N0utx znd6*#vX>>E*PQ@po`UY#T%qs{q(Ys0t@-Aokm^QehCV_Vp=Lt*muXiouoMYZu08l+ zU8FMFqja50XJe?G8L~^Hu*Qm;oGPjr1|-@AWfY||d6*O(OZ7UWuBIwEDU%L4B#B>` zj>_t6thO>3t*0<-DD4r}ZYrUjLUr~UWOe}iW2ND486vCaj+7szt!9XAx}qAp?6dUN z3*L&G8XCyENaYz$u_BraFuDV)+v|1zPG|5^R%S843?&p-z)G;Rq106P<} B+JyiB literal 0 HcmV?d00001 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, -- 2.11.0