From 2dceb39b063907234fe60afd74e144d59ae155fa Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 22 Oct 2007 16:54:54 -0500 Subject: [PATCH] Fixing and refining toolbars, including fixes for Bug 1509. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/intranet-tmpl/prog/en/css/print.css | 313 ++++++++++++++++++ .../prog/en/css/staff-global.css | 12 +- .../prog/en/includes/cat-toolbar.inc | 81 ++++- .../prog/en/includes/circ-toolbar.inc | 14 +- .../prog/en/includes/members-toolbar.inc | 43 +++ .../prog/en/modules/catalogue/ISBDdetail.tmpl | 27 -- .../prog/en/modules/catalogue/MARCdetail.tmpl | 23 -- .../prog/en/modules/catalogue/detail.tmpl | 28 -- .../en/modules/catalogue/detailprint.tmpl | 48 +++ .../prog/en/modules/members/boraccount.tmpl | 11 +- .../prog/en/modules/members/deletemem.tmpl | 6 +- .../prog/en/modules/members/mancredit.tmpl | 22 +- .../prog/en/modules/members/maninvoice.tmpl | 28 +- .../prog/en/modules/members/member-flags.tmpl | 8 +- .../en/modules/members/member-password.tmpl | 5 +- .../prog/en/modules/members/member.tmpl | 19 +- .../prog/en/modules/members/pay.tmpl | 12 +- .../prog/en/modules/members/readingrec.tmpl | 5 +- members/member-flags.pl | 2 +- 19 files changed, 540 insertions(+), 167 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/print.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/print.css b/koha-tmpl/intranet-tmpl/prog/en/css/print.css new file mode 100644 index 0000000000..b613f6e18a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/css/print.css @@ -0,0 +1,313 @@ +a:link { + color : #000066; + text-decoration: none; +} + +a:visited { + color : #000066; + text-decoration: none; +} + +a:hover { + color : #993300; + text-decoration: none; +} + +body { + background-color : #FFF; + color : #333333; + font-family : arial, geneva, sans-serif; + font-size : 14px; + margin : 0px 0px 0px 0px; +} + +caption { + color : #000066; + font-size : 18px; + font-weight : bold; + margin-top : 5px; + text-align : left; +} + +form { + margin : 0px; + padding : 0px; +} + +h1 + { + color : #000066; + font-size : 22px; + font-weight : bold; + margin-bottom : 3px; + margin-top : 3px; +} + +h2 { + color : #000066; + font-size : 20px; + font-weight : bold; + margin-bottom : 3px; + margin-top : 3px; +} + +h3 { + color : #000066; + font-size : 18px; + font-weight : bold; + margin-bottom : 3px; + margin-top : 3px; +} + +h4 { + color : #000066; + font-size : 16px; + font-weight : bold; + margin-bottom : 3px; + margin-top : 3px; +} + +h5 { + color : #000066; + font-size : 15px; + font-weight : bold; + margin-bottom : 1px; + margin-top : 1px; +} + +h6 { + color : #000066; + font-size : 14px; + font-weight : bold; + margin-bottom : 1px; + margin-top : 1px; +} + +table { + background-color : #FFFFFF; + border-bottom : 1px solid #CCCCCC; + border-collapse : collapse; + border-left : 1px solid #CCCCCC; + margin : 3px 0px 5px 0px; + padding : 0px; + width : 99%; +} + +table.list { + background-color : #FFFFFF; + border : 0; + border-collapse : collapse; + margin : 3px 0px 5px 0px; + padding : 0px; + width : 99%; +} + +td { + background-color : #FFF; + border-bottom : 1px solid #CCCCCC; + border-right : 1px solid #CCCCCC; + border-top : 0; + border-left : 0; + font-size : 12px; + padding : 5px 5px 5px 5px; +} + +td:last-child { + background-color : #FFF; + border-bottom : 1px solid #CCCCCC; + border-right : 0px solid #CCCCCC; + border-top : 0; + border-left : 0; + font-size : 12px; + padding : 5px 5px 5px 5px; +} + +table.list th { + background-color : #FFFFFF; + border-top : 0; + border-left : 0; + text-align: left; + font-size: 12px; + font-weight: bold; + padding: 5px; + width : 25%; +} + +th { + background-color : #E9E9E9; + border-bottom : 1px solid #CCCCCC; + border-right : 1px solid #CCCCCC; + border-top : 0; + border-left : 0; + font-size : 14px; + font-weight : bold; + padding : 5px 5px 5px 5px; +} + +th:last-child { + background-color : #E9E9E9; + border-bottom : 1px solid #CCCCCC; + border-right : 0px solid #CCCCCC; + border-top : 0; + border-left : 0; + font-size : 14px; + font-weight : bold; + padding : 5px 5px 5px 5px; +} + +td.input, div.form td, div.details td { + border-bottom : 1px solid #CCCCCC; + border-left : 0px; + border-right : 0px; + color : #000000; + line-height : 1.5em; + padding : 4px; + text-align : left; +} + +td.label, div.form th, div.details th { + background-color : #FFF; + border-bottom : 1px solid #CCCCCC; + border-left : 1px solid #CCCCCC; + border-right : 0px; + border-top : 0px; + color : #000088; + font-weight : bold; + line-height : 1.5em; + padding : 4px; + text-align : right; + vertical-align : top; +} + +tr.highlight { + background-color: #CCCCCC; +} + +.cancel { + background-color : #993300; + color : #FFFFCC; + font-size : 12px; + font-weight : bold; + padding : 2px; +} + +.error { + font-weight: bold; +} + +.ex { + font-family : "Courier New", Courier, monospace; +} +.inline { + display : inline; +} + +.print { + display : none; +} + +.submit { + background-color : #669999; + color : #FFFFCC; + font-size : 12px; + font-weight : bold; + padding : 2px; +} + +#main { + background-color : #FFF; + border-left : 0px solid #CCCC99; + margin-left : 2%; + margin-right : 2%; + margin-top : 1%; + padding : 5px; + position : relative; +} + +tr.overdue { + font-weight : bold; +} + +tfoot { + font-weight : bold; +} + +tfoot td, tfoot td:last-child { + background-color : #EEEEEE; + border-right : 1px solid #666666; + border-bottom : 1px solid #666666; +} + +td.credit, td.debit, td.sum { + font-family : "Courier New", Courier, monospace; + text-align : right; +} + +td.debit { + color : #990000; +} + +#receipt { + background-color : #FFFFFF; + font-family : serif; + font-size : .9em; + margin : 0 0px 0px 0; + padding : 0px; + position : relative; +} + +#receipt a:link { + color : #000066; + text-decoration: none; +} + +#receipt a:visited { + color : #000066; + text-decoration: none; +} + +#receipt a:hover { + color : #993300; + text-decoration: none; +} + +#receipt caption { + color : #000000; + font-weight : bold; + margin-top : 5px; + text-align : left; +} + +#receipt div.table { + background-color : transparent; + font-weight: normal; +} + +#receipt h3, #receipt caption { + background-color : transparent; + color : #000000; + font-size : 1em; + font-weight : bold; + margin-bottom : 3px; + margin-top : 3px; +} + +#receipt table { + background-color : transparent; + border : 0; + border-collapse : collapse; + width : auto; +} + +#receipt td, #receipt th { + background-color : transparent; + border : 0; + font-size : 1em; + font-weight : normal; + padding : 1px; + } + +#receipt th { + font-weight : bold; + text-align : left; + } \ No newline at end of file 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 ba830d54c6..d9fd7324ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -498,9 +498,13 @@ fieldset.brief label { padding : .3em 0; } +fieldset.brief ol, fieldset.brief li { + list-style-type : none; +} + fieldset.brief div.hint { color : #999999; - font-size : 80%; + font-size : 90%; margin-bottom : .4em; } @@ -725,21 +729,21 @@ fieldset.rows .inputnote { background-repeat : no-repeat; } -#deletebiblio a, #deletepatron a { +#deletebiblio button, #deletebiblio a, #deletepatron a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-delete.gif"); background-position : center left; background-repeat : no-repeat; } -#printbiblio a { +#printbiblio button, #printbiblio a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-print.gif"); background-position : center left; background-repeat : no-repeat; } -#addtoshelf a { +#addtoshelf button, #addtoshelf a { padding-left : 34px; background-image: url("/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif"); background-position : center left; 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 c63b6f4f55..7922fcba01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -1,6 +1,33 @@
+
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 8a47844cee..5f8f1aec0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl @@ -2,32 +2,6 @@ Koha › Catalogue › ISBD Details for <!-- TMPL_VAR NAME="title" --> - @@ -56,7 +30,6 @@ function confirm_deletion(count) {
-
\ 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 6ff29aaf95..f7071320b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl @@ -3,34 +3,12 @@ @@ -263,7 +236,6 @@ function confirm_deletion(count) {
-
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl new file mode 100644 index 0000000000..f316ef9e99 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detailprint.tmpl @@ -0,0 +1,48 @@ + +Koha › Catalogue › Details for <!-- TMPL_VAR NAME="title" --> + +/css/print.css" /> + + + + + +
+ + + + +  +  + + + + + + + + + + + + +
Biblio Record Number:
Author:
Additional Author:
Publisher:
Publication Details: + , + ,
Collection:
Subject:
Copyright Date:
Notes:
Unititle:
Dewey:
Classification:
LCCN:
URL: ">
ISBN:
+ + + + + + + + + + + + + + +
Item TypeCall NumberLocationDate DueLast SeenBarcode
,  
+ + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl index dd1f735fc5..423fba9098 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl @@ -1,8 +1,9 @@ -Account for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> +Koha › Patrons › Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> + - + @@ -13,12 +14,8 @@
- - +
-
- ">Return to Patron Record -
" >Pay fines " >Create Manual Invoice diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl index e100213924..84fb5f1303 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl @@ -1,8 +1,9 @@ Koha › Can't Delete Patron + - + @@ -12,8 +13,7 @@
- -

Cannot Delete Patron

+

Cannot Delete Patron

  • Patron has item(s) checked out.
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl index 2e3f7513b9..060e05d89f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl @@ -1,8 +1,9 @@ Koha › Borrowers › Create Manual Credit + - + @@ -13,21 +14,20 @@
    - -

    Manual Credit

    +
    " /> - - - - - - -
    Patron Number
    Credit Type -
    Itemnumber
    Description
    Amount$
    + +
    • +
    • +
    • +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl index 6b516393d2..1e1cb2f82d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl @@ -1,8 +1,9 @@ Koha › Borrowers › Create Manual Invoice + - + @@ -13,29 +14,28 @@
    - - + ERROR an invalid itemnumber was entered, please hit back and try again
    " /> - - - - - - - -
    Manual Invoice
    Borrowernumber
    Type -
    Itemnumber
    Description
    Amount$
    - + +
    • +
    • +
    • + +
    " />
    @@ -46,7 +46,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl index e8b17d4a76..6dde676a08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl @@ -1,8 +1,9 @@ Koha › Patrons › Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> + - + @@ -13,9 +14,10 @@
    +
    - " /> + " />

    Set Privileges for ,

    @@ -46,7 +48,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl index 2bcd2b1c66..1221f98b04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl @@ -1,8 +1,9 @@ Koha › Patrons › <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --> + - + @@ -43,7 +44,7 @@
    - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl index f4441c63c9..65459a940f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -1,29 +1,22 @@ -Koha › Patrons › Search Results +Koha › Patrons <!-- TMPL_IF NAME="searching" -->› Search Results<!-- /TMPL_IF --> + - + - +
    + + - - - - order by: - - -
    Browse by last name: A diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl index e799f512d7..689e27b0d1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl @@ -1,8 +1,9 @@ -Pay Fines for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --> +Koha › Patrons › Pay Fines for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> + - + @@ -13,9 +14,9 @@
    + -

    Pay Fines for

    -
    + " />
    @@ -64,8 +65,7 @@
    - -
    " method="get">" />
    +

    has no outstanding fines.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl index c54375c0fe..f6f99b6f92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl @@ -1,8 +1,9 @@ Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> + - + @@ -13,7 +14,7 @@
    - +
    • Showing All Items
      • diff --git a/members/member-flags.pl b/members/member-flags.pl index 7437f6a997..bfc74b31f7 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -70,7 +70,7 @@ if ($input->param('newflags')) { push @loop, \%row; } - $template->param(member => $member, + $template->param(borrowernumber => $member, surname => $bor->{'surname'}, firstname => $bor->{'firstname'}, loop => \@loop, -- 2.20.1