From 275d5ee24c327f309fc3f11d09ee741f446e508f Mon Sep 17 00:00:00 2001 From: kados Date: Tue, 11 Jul 2006 14:06:57 +0000 Subject: [PATCH] sync with rel_2_2 and some minor updates --- .../opac-tmpl/npl/en/includes/catsearch.js | 4 +- .../opac-tmpl/npl/en/includes/livesearch.js | 8 +- koha-tmpl/opac-tmpl/npl/en/includes/main.js | 3 +- .../opac-tmpl/npl/en/includes/masthead.inc | 19 +- .../opac-tmpl/npl/en/includes/navigation.inc | 5 +- .../npl/en/includes/opac-colors.npl.css | 20 +- .../npl/en/includes/opac-colors.smfpl.css | 6 + .../opac-tmpl/npl/en/includes/opac-layout.css | 46 +++- .../npl/en/includes/opac-layout.smfpl.css | 33 +++ .../opac-tmpl/npl/en/opac-MARCdetail.tmpl | 20 +- .../opac-tmpl/npl/en/opac-catalogue-home.tmpl | 226 ++++++++++++++++++ koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl | 53 ++++ koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl | 6 +- .../opac-tmpl/npl/en/opac-dictionary.tmpl | 3 + koha-tmpl/opac-tmpl/npl/en/opac-main.tmpl | 2 +- koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl | 182 +++++++++----- .../opac-tmpl/npl/en/opac-searchresults.tmpl | 2 +- koha-tmpl/opac-tmpl/npl/en/opac-user.tmpl | 2 +- .../opac-tmpl/npl/en/opac-zoomsearch.tmpl | 95 +++++--- 19 files changed, 595 insertions(+), 140 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/npl/en/opac-catalogue-home.tmpl create mode 100644 koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/catsearch.js b/koha-tmpl/opac-tmpl/npl/en/includes/catsearch.js index bb2cffe9bd..b3c32f2436 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/catsearch.js +++ b/koha-tmpl/opac-tmpl/npl/en/includes/catsearch.js @@ -1,12 +1,12 @@ function hideSearchsTypes() { - document.getElementById('cql').style.display = 'none'; + document.getElementById('simple').style.display = 'none'; document.getElementById('advanced').style.display = 'none'; document.getElementById('power').style.display = 'none'; document.getElementById('proximity').style.display = 'none'; } function resetButtonsColors() { - document.getElementById('cql_formButton').className = 'off'; + document.getElementById('simple_formButton').className = 'off'; document.getElementById('advanced_formButton').className = 'off'; document.getElementById('power_formButton').className = 'off'; document.getElementById('proximity_formButton').className = 'off'; diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/livesearch.js b/koha-tmpl/opac-tmpl/npl/en/includes/livesearch.js index 87229810f9..41062bb150 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/livesearch.js +++ b/koha-tmpl/opac-tmpl/npl/en/includes/livesearch.js @@ -118,11 +118,11 @@ function liveSearchDoSearch() { if (typeof liveSearchParams == "undefined") { liveSearchParams = ""; } - if (liveSearchLast != document.forms.searchform.cql_query.value) { + if (liveSearchLast != document.forms.searchform.ccl_query.value) { if (liveSearchReq && liveSearchReq.readyState < 4) { liveSearchReq.abort(); } - if ( document.forms.searchform.cql_query.value == "") { + if ( document.forms.searchform.ccl_query.value == "") { liveSearchHide(); return false; } @@ -132,8 +132,8 @@ function liveSearchDoSearch() { liveSearchReq = new ActiveXObject("Microsoft.XMLHTTP"); } liveSearchReq.onreadystatechange= liveSearchProcessReqChange; - liveSearchReq.open("GET", liveSearchRoot + "/cgi-bin/koha/livesearch.pl?cql_query=" + document.forms.searchform.cql_query.value + liveSearchParams); - liveSearchLast = document.forms.searchform.cql_query.value; + liveSearchReq.open("GET", liveSearchRoot + "/cgi-bin/koha/livesearch.pl?ccl_query=" + document.forms.searchform.ccl_query.value + liveSearchParams); + liveSearchLast = document.forms.searchform.ccl_query.value; liveSearchReq.send(null); } } diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/main.js b/koha-tmpl/opac-tmpl/npl/en/includes/main.js index 2a8b6c934c..3d568183d7 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/main.js +++ b/koha-tmpl/opac-tmpl/npl/en/includes/main.js @@ -5,5 +5,6 @@ window.onload=kohajs; // check to see if functions exist before loading them function kohajs() { if ( typeof window.verify_images == "function" ) verify_images(); +// if ( typeof window.liveSearchInit == "function" ) liveSearchInit(); + if ( typeof window.runLSPrep == "function" ) runLSPrep(); } - diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc index 3962a10f51..90f8d31178 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc @@ -1,14 +1,15 @@

<!-- TMPL_VAR NAME=" src="" />Library Catalog Search

-
-

Search Home | Book Bag

- - - - - - -  

+
+ +
+ + + +
+ +

Search Home | Book Bag

+
    diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc index 1d22f6eb40..20a2f8a8f0 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc +++ b/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc @@ -1 +1,4 @@ - + diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css b/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css index ff0a3ebce3..4112082dcb 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css +++ b/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css @@ -372,6 +372,9 @@ input.icon { background-color : #FFFFCC; } +.search-main { +} + .sidebar-box { border : 1px dashed #CCCC99; } @@ -459,7 +462,7 @@ ul.link-tabs li.off a:hover { border-right : 2px solid #333333; } -#loose_form label, #keyword_form label, #precise_form label, #cql_form label { +#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #simple label, #power label, #proximity label { color : #000066; } @@ -471,4 +474,17 @@ ul.link-tabs li.off a:hover { #search-footer a { background-color: #D8DEB8; -} \ No newline at end of file +} + +td.search-options { + background-color : #FFFFE3; + border-bottom: 1px solid #BEBF84; +} + +td.search-options select { + background-color: #FFFFEC; +} + +a.help { + background-color : #FFFFEC; +} diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.smfpl.css b/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.smfpl.css index be8e39f8f9..9ce8cdd0b8 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.smfpl.css +++ b/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.smfpl.css @@ -613,4 +613,10 @@ span.print { #starFull { } +.MARCtag { /* style for tag definition (700 - Statement of responsability) */ + color:#000066; + background-color:#EEEEEE; +} +.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */ +} diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css b/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css index a2d674cf91..32e9761bf0 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css +++ b/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css @@ -280,7 +280,7 @@ td:last-child { } .content-block { - margin : 15px; + margin : 5px; padding : 5px; width : 90%; } @@ -708,13 +708,18 @@ input.edit, a.edit { } #search-sidebar { - width : 33%; + width : 30%; margin : 10px; padding : 3px; float : right; font-size : 80%; } +.search-main { + width : 65%; + float: left; +} + .sidebar-box { margin-bottom : 0; } @@ -727,8 +732,9 @@ div.sidebar-box+div.sidebar-box { margin-left : 10px; } -.sidebar-box label { +#search-sidebar .sidebar-box label { display : block; + text-align : left; } .sidebar-box p { @@ -838,13 +844,13 @@ div.tab p.MARCtag { /* style for tag definition (700 - Statement of responsabili ul.link-tabs { list-style-type : none; - margin: 10px 10px -2px 0; + margin: 9px 0 -2px 5px; padding : 0; } ul.link-tabs li { display: inline; - padding: 5px; + padding: 0px; } ul.link-tabs li a { @@ -864,13 +870,13 @@ ul.link-tabs li.off a:hover { padding: 2px 3px 2px 4px; } -#loose_form label, #keyword_form label, #precise_form label, #cql_form label { +#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label { font-size: 90%; font-weight : bold; text-align: right; } -#loose_form, #keyword_form, #precise_form, #cql_form { +#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity { margin: 5px; width : 96%; } @@ -884,4 +890,30 @@ ul.link-tabs li.off a:hover { margin: 3px 5px 3px 5px; text-decoration: none; padding: 2px 5px; +} + +td.search-options select { + font-size : 80%; +} + +#sort { + margin : .3em; +} + +#sort, #sort select, #sort input { + font-size: 80%; +} + +a.help { + font-size : 80%; + padding : 3px; + text-decoration : none; +} + +#power_formButton, #proximity_formButton { + font-size : 75%; +} + +ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a { + padding: 2px 4px 3px 4px; } \ No newline at end of file diff --git a/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.smfpl.css b/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.smfpl.css index eebf6ecefd..496fadf066 100644 --- a/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.smfpl.css +++ b/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.smfpl.css @@ -423,7 +423,9 @@ div.bookcover { .marcsubfieldname { font-family : Arial, Geneva, Helvetica, sans-serif; + font-size: 70%; padding : 3px; + width: 18%; } .subfield { @@ -834,3 +836,34 @@ span.print { background: url(../images/bluestars.png) top left no-repeat; } +div.tabbloc { + font-family: Arial, Helvetica, sans-serif; + font-size: 80%; +} + +div.tab { + display: block; + float:left; + margin-right:0px; + width:100%; +} + +div.tab p { + margin : 0; + padding : 3px 0; +} + +.MARCtag { /* style for tag definition (700 - Statement of responsability) */ + font-weight:bold; + clear : both; + margin : 0; + padding : 2px 0; +} + +.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */ + clear : both; + font-weight : bold; + float:left; + width: 12em; + margin-left:30px; +} diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl index 55b343b9c9..4df5e8f3a4 100644 --- a/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl +++ b/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl @@ -32,7 +32,7 @@

    @@ -54,7 +54,7 @@

    @@ -76,7 +76,7 @@

    @@ -98,7 +98,7 @@

    @@ -120,7 +120,7 @@

    @@ -142,7 +142,7 @@

    @@ -164,7 +164,7 @@

    @@ -186,7 +186,7 @@

    @@ -208,7 +208,7 @@

    @@ -230,7 +230,7 @@

    diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-catalogue-home.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-catalogue-home.tmpl new file mode 100644 index 0000000000..73b2c5df2e --- /dev/null +++ b/koha-tmpl/opac-tmpl/npl/en/opac-catalogue-home.tmpl @@ -0,0 +1,226 @@ + Catalog -- Advanced Search + + + + +

    + +

    Catalogue Search

    + + + + + +
    style="display:block;" style="display:none;"> +
    + + + + + +

    " />

    +rpn +

    +
    +
    + + + +
    style="display:block;" style="display:none;"> +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    " />
    " >
    +
    " /> + + " />
    checked="checked" /> checked="checked" />
    + +

    + +
    +
    + + +
    style="display:block;" style="display:none;"> +
    + + + + + + + + + + + + + + + + + + + + + + + +
    " id="field_value" type="text" />.value, document.loose_form.field_value.value, 'opener.document.loose_form.field_value')); return false;">... + + + + + + +   +
    + +
    + + +
    +
    +

    +

    + + +
    +
    + + +
    style="display:block;" style="display:none;"> +
    + + + + + + + + + + + + + + + + + +
    " onchange="if(this.value != '') {this.form.isbn.value = ''; this.form.biblionumber.value = ''}" />
    " onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.biblionumber.value = ''} " />
    " onchange="if(this.value != '') {this.form.itemnumber.value = ''; this.form.isbn.value = ''} " />
    + +
    + +

    +
    +
    + + diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl new file mode 100644 index 0000000000..d91eb70df2 --- /dev/null +++ b/koha-tmpl/opac-tmpl/npl/en/opac-cql.tmpl @@ -0,0 +1,53 @@ + -- Library Catalog + + + + +
    + +
    + + + + + +
    +

    Search the Library Catalog

    +

    + + +

    +

    + +

    Results

    + + + + +
    title
    + + +
    +

    You're logged in as (Click here if you're not )

    +

    my library home | my fines | + my personal details | my reading history | my book lists | purchase suggestions

    + +

    Message from the library

    +

    + + +

    + +
    + + +
    + + + diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl index a49c113827..b9440a73ee 100644 --- a/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/npl/en/opac-detail.tmpl @@ -134,7 +134,11 @@ - Available + + Item Lost + + Item CancelledAvailable + diff --git a/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl b/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl index dd95ad478e..bee40c6b5e 100644 --- a/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl +++ b/koha-tmpl/opac-tmpl/npl/en/opac-dictionary.tmpl @@ -120,6 +120,9 @@