From 844fb27204b77701522cc8f0652b53236e0a27bf Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 29 Oct 2007 13:54:10 -0500 Subject: [PATCH] Finishing circ page layout changes. Still need to iron out standards for warning/message styles. Also renaming a couple of includes and correcting the relevant files. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../prog/en/css/staff-global.css | 33 +++++++ .../prog/en/includes/cat-search.inc | 13 ++- .../prog/en/includes/circ-toolbar.inc | 2 +- .../{members-search.inc => patron-search.inc} | 0 ...members-toolbar.inc => patron-toolbar.inc} | 0 .../prog/en/modules/circ/circulation.tmpl | 85 +++++++++--------- .../prog/en/modules/members/boraccount.tmpl | 2 +- .../prog/en/modules/members/deletemem.tmpl | 2 +- .../prog/en/modules/members/mancredit.tmpl | 2 +- .../prog/en/modules/members/maninvoice.tmpl | 2 +- .../prog/en/modules/members/member-flags.tmpl | 2 +- .../en/modules/members/member-password.tmpl | 2 +- .../prog/en/modules/members/member.tmpl | 4 +- .../en/modules/members/memberentrygen.tmpl | 2 +- .../prog/en/modules/members/moremember.tmpl | 43 +++++---- .../prog/en/modules/members/pay.tmpl | 2 +- .../prog/en/modules/members/readingrec.tmpl | 2 +- .../intranet-tmpl/prog/img/arrow-bullet.gif | Bin 0 -> 48 bytes 18 files changed, 123 insertions(+), 75 deletions(-) rename koha-tmpl/intranet-tmpl/prog/en/includes/{members-search.inc => patron-search.inc} (100%) rename koha-tmpl/intranet-tmpl/prog/en/includes/{members-toolbar.inc => patron-toolbar.inc} (100%) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/arrow-bullet.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 c42ef34e1d..d941b6e8ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -824,4 +824,37 @@ span.expired { div.help { margin: .9em 0 0 0; +} + +.blocker { + color : #990000; +} + +div.warning { + background-color : #FFFFCC; + border-color : #990000; +} + +.circmessage li { + list-style : url(../../img/arrow-bullet.gif); + margin-bottom : .2em; +} + +div.circmessage:first-child { + margin-top : 1em; +} + +div.circmessage { + border: 1px solid #CCC; + padding: .4em; + margin-bottom : .3em; +} + +span.circ-hlt { + color : #cc0000; + font-weight : bold; +} + +div.first fieldset { + margin-right : 0; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc index bf83038dce..9c49451ee5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -9,7 +9,17 @@ - + + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc index ba867b3c44..fb6041c6ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc @@ -75,7 +75,7 @@ function confirm_reregistration() { //]]>
    -
  • ">Check Out
    • +
  • ">Check Out
  • &category_type=C">Add child
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc rename to koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc rename to koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc 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 572308507d..378fc4a59e 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl @@ -103,11 +103,10 @@ -

    + +

    No patron matched -Add adult -Add child -

    +

    @@ -139,12 +138,13 @@ No patron matched -
    +
    + +
    -
    Checking out to
    -

    + @@ -511,26 +511,35 @@ No patron matched
    -
    +
    + +
    -
    -

    Attention:

    + +
    + +
    + +

    Cannot Check Out!Attention:

    +
    + -
  • - Holds waiting: +
    +

    Holds waiting:

    • "> (), by , reserved on @@ -540,17 +549,14 @@ No patron matched
    -
    • +
    -
- - -
+

Notes:

-

+

@@ -588,8 +594,8 @@ No patron matched " /> - + @@ -604,12 +610,12 @@ No patron matched + - - "> + "> + + + + Hold priority : + + +
Title Due dateTitle Itemtype Call no Barcode
&type=intra"> , by - @@ -641,11 +647,11 @@ No patron matched
- &type=intra"> -
- + 		- + &type=intra"> +
- 		@@ -692,19 +698,18 @@ No patron matched Call Number
- -&type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"> - - -Hold priority : - - - "> ( ) 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 423fba9098..7440d1a892 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl @@ -5,7 +5,7 @@ - + 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 84fb5f1303..b932100c9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl @@ -5,7 +5,7 @@ - +
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 060e05d89f..db790c1d7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl @@ -5,7 +5,7 @@ - + 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 1e1cb2f82d..1408327b59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl @@ -5,7 +5,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 6dde676a08..b0bf15347f 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 @@ -5,7 +5,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 1221f98b04..bbc599d4d1 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 @@ -5,7 +5,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 af8397565d..604010a42b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -5,7 +5,7 @@ - + @@ -15,7 +15,7 @@
- +
Browse by last name: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl index e1c56c936b..5e857977e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl @@ -9,7 +9,7 @@ patron - +