From bccf46fade416cbc908ac294d96ea534b1a73a3d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 10 Sep 2007 15:08:29 -0500 Subject: [PATCH] More work on resident search, adding breadcrumbs and resident search to member pages. Signed-off-by: Chris Cormack --- .../prog/en/css/staff-global.css | 123 ++++++++++++++++-- .../prog/en/includes/circ-search.inc | 4 +- .../prog/en/includes/doc-head-close.inc | 7 +- .../intranet-tmpl/prog/en/includes/header.inc | 10 +- .../prog/en/includes/members-menu.inc | 7 + .../prog/en/includes/members-search.inc | 36 +++++ .../intranet-tmpl/prog/en/js/staff-global.js | 19 ++- .../prog/en/lib/jquery/plugins/clickmenu.css | 115 ++++++++++++++++ .../jquery/plugins/jquery.clickmenu.pack.js | 1 + .../prog/en/lib/jquery/plugins/myshadow.png | Bin 0 -> 5741 bytes .../prog/en/modules/members/boraccount.tmpl | 6 +- .../prog/en/modules/members/deletemem.tmpl | 4 +- .../en/modules/members/guarantor_search.tmpl | 4 + .../prog/en/modules/members/mancredit.tmpl | 6 +- .../prog/en/modules/members/maninvoice.tmpl | 6 +- .../prog/en/modules/members/member-flags.tmpl | 6 +- .../en/modules/members/member-password.tmpl | 6 +- .../members/member-quicksearch-results.tmpl | 1 - .../modules/members/member-quicksearch.tmpl | 1 - .../prog/en/modules/members/member.tmpl | 7 +- .../prog/en/modules/members/memberentryA.tmpl | 6 +- .../prog/en/modules/members/memberentryC.tmpl | 6 +- .../prog/en/modules/members/memberentryI.tmpl | 6 +- .../prog/en/modules/members/memberentryP.tmpl | 6 +- .../en/modules/members/moremember-print.tmpl | 1 - .../modules/members/moremember-receipt.tmpl | 1 - .../prog/en/modules/members/moremember.tmpl | 10 +- .../prog/en/modules/members/pay.tmpl | 6 +- .../prog/en/modules/members/readingrec.tmpl | 6 +- 29 files changed, 365 insertions(+), 52 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/clickmenu.css create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.clickmenu.pack.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/myshadow.png 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 70889f73e6..52d180749b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -137,13 +137,6 @@ li { line-height : 2em; } -#toplevelnav li.more a { - background-image: url("../../img/more-arrow.gif"); - background-position: right; - background-repeat: no-repeat; - padding-right : 13px; -} - #submenu { margin : 0 0 .5em 0; padding : 0; @@ -158,7 +151,7 @@ li { padding-left : 0; } -#toplevelnav ul { +/*#toplevelnav ul { margin : 0; padding : 0; } @@ -172,7 +165,7 @@ li { #toplevelnav li:last-child, #submenu li:last-child { border : 0; -} +}*/ table { border-collapse : collapse; @@ -255,16 +248,22 @@ div#header_search ul.link-tabs { margin-bottom : -4px; } -div#header_search ul.link-tabs li.on a, div#header_search ul.link-tabs li a, div#header_search ul.link-tabs li.off a { +div#header_search ul.link-tabs li.on a, +div#header_search ul.link-tabs li a, +div#header_search ul.link-tabs li.off a { padding : 0.1em .5em .2em .5em; } -div#circ_search,div#catalog_search { +div#circ_search,div#catalog_search,div#patron_search { border : 0; border-bottom : 1px solid #FF9900; padding : 0 0 .2em 0; } +div#patron_search { + display : none; +} + div#circ_search { display : block; } @@ -319,4 +318,106 @@ ul.link-tabs li.on a { div#header_search .tip { font-size: 93%; color : Gray; +} + +/* ClickMenu Overrides */ + +div.cmDiv +{ + border: 0; + background-color: #F3F3F3; +} + + +.clickMenu li.more a { + background-image: url("../../img/more-arrow.gif"); + background-position: right; + background-repeat: no-repeat; + padding-right : 13px; +} + +.clickMenu li.more li a { + background-image : none; + padding-right : 0; +} + +.clickMenu +{ + margin: 0; + padding: 0; + cursor: default; +} +.clickMenu, .clickMenu ul +{ + list-style: none; +} +.clickMenu ul +{ + margin: 0; + padding: 2px; + border: 0; + background-color: #F3F3F3; + min-width: 100px; /* ie doesnt know this :/ */ + //float: left;/*ie again*/ + //width: 100%;/*and again*/ +} +.clickMenu div.outerbox +{ + display: none; + min-width: 106px; /* firefox produces animation-flickering when the box is bigger than this :/ */ +} +.clickMenu div.inner +{ + //top: 20px; /* for ie */ + left: 0; + margin: 0; +} +.clickMenu div.inner div.outerbox +{ + margin: 0; + left: 98px; + //left: 90px; /* for ie */ + top: -3px; +} +.clickMenu li +{ + list-style-type : none; + position: relative; + padding: 0 20px 0 2px; + /*white-space: nowrap; does not really work in ie */ +} +.clickMenu li.main +{ + float: left; + padding: 0 10px; + background-color: #F3F3F3; + //height: 20px; /* for ie */ +} +.clickMenu li.main li +{ + z-index: 2; + min-width: 78px; +} +.clickMenu li.hover +{ + z-index: 1 !important; /* the hover z-index has to be below the normal one the hovering items may be drawn over a submenu */ + background-color : transparent; +} +.clickMenu img.liArrow +{ + position: absolute; + right: 5px; + top: 0.41em; +} +.clickMenu ul a { + cursor: default; +} + +ul.innerBox a { + cursor : pointer; +} + +ul.innerBox { + + border: 1px solid #E8E8E8; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index 1045d4ee05..64e71cd852 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -1,4 +1,4 @@ - + - + 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 d1bd371f5f..357079e175 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl @@ -4,7 +4,9 @@ - + + +
@@ -44,5 +46,5 @@
- + 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 df8f726cb1..92fc809160 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 @@ -4,7 +4,9 @@ - + + +
@@ -40,5 +42,5 @@
- + 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 fa2a75d680..e4cde01f64 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 @@ -4,7 +4,9 @@ - + + +
@@ -40,5 +42,5 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl index 2b5deadc86..1783a63801 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl @@ -54,5 +54,4 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl index b1a6170ef5..a8bce56cf6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl @@ -19,5 +19,4 @@ - 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 9e7f72c8be..2187e4e094 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl @@ -4,8 +4,9 @@ + - +
@@ -13,8 +14,6 @@
-Home › patrons › Search Results -
@@ -102,5 +101,5 @@ document.f.member.focus();
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl index 0e2bcdb003..2c42633c82 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl @@ -6,7 +6,9 @@ - + + +
@@ -631,5 +633,5 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl index 67c50a6553..312d92399f 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl @@ -6,7 +6,9 @@ - + + +
@@ -678,5 +680,5 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl index d9d8de8e72..b5ce9e39a4 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl @@ -6,7 +6,9 @@ - + + +
@@ -486,5 +488,5 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl index e57712dd77..44225bb78f 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl @@ -6,7 +6,9 @@ - + + +
@@ -677,5 +679,5 @@
- + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl index 8d949bcfcb..a68fcb1d0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl @@ -70,5 +70,4 @@ - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl index 72205253ce..ed3c6ae8b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl @@ -54,5 +54,4 @@ Issued To 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 d6a5ea7306..0dfeb4ab96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl @@ -1,5 +1,5 @@ -Koha › Patron Details +Koha › Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->