From f91441f5f5202047193c303b917af271afec773a Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Sun, 10 Apr 2011 20:04:50 +1200 Subject: [PATCH] Bug 5917 : Catching pref,css and js changes --- .../prog/en/css/staff-global.css | 56 +++++++++++++++++++ koha-tt/intranet-tmpl/prog/en/js/acq.js | 32 +++++++---- .../prog/en/js/xmlControlfield.js | 2 +- .../en/modules/admin/preferences/admin.pref | 1 + .../admin/preferences/cataloguing.pref | 13 +++++ .../admin/preferences/circulation.pref | 38 +++++++++---- .../en/modules/admin/preferences/opac.pref | 49 +++++++++++++++- .../modules/admin/preferences/searching.pref | 26 +++++++++ .../en/modules/admin/preferences/serials.pref | 10 +++- .../admin/preferences/staff_client.pref | 20 +++++++ .../value_builder/marc21_field_006.xml | 4 +- koha-tt/opac-tmpl/prog/en/css/opac.css | 13 ++++- 12 files changed, 236 insertions(+), 28 deletions(-) diff --git a/koha-tt/intranet-tmpl/prog/en/css/staff-global.css b/koha-tt/intranet-tmpl/prog/en/css/staff-global.css index 49ed8c3753..c2115074e6 100644 --- a/koha-tt/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tt/intranet-tmpl/prog/en/css/staff-global.css @@ -1933,3 +1933,59 @@ ul.budget_hierarchy li:first-child:after { margin : 1em 0; } fieldset.rows+h3 {clear:both;padding-top:.5em;} + +.import_export{ + position:relative; +} +.import_export .import_export_options{ + background: white; + border: 1px solid #CDCDCD; + left: 60px; + padding: 10px; + position: absolute; + top: 0; + z-index: 1; + width: 300px; +} +.import_export_options li{ + display: block; + list-style: none; + padding-top: 10px; +} +.import_export_options .import_export_close { + cursor: pointer; + text-decoration: underline; +} +.import_export_options .export_ok { + padding: 10; + background: #E3E3E3 none; + cursor: pointer; + margin-left: 20px; + border: none; +} +.import_export_options .import_ok { + padding: 10; + background: #E3E3E3 none; + cursor: pointer; + margin-left: 20px; + border: none; +} +.form_import .input_import { + border: 1px solid #bcbcbc; +} +.import_export_options .importing { + padding: inherit; + background: none; +} +.li_close_import_export { + text-align: right; +} + +.importing { + position: relative; +} + +.importing .importing_msg { + padding-left: 10px; + padding-bottom: 10px; +} \ No newline at end of file diff --git a/koha-tt/intranet-tmpl/prog/en/js/acq.js b/koha-tt/intranet-tmpl/prog/en/js/acq.js index 326062db38..bcfb7b81c8 100644 --- a/koha-tt/intranet-tmpl/prog/en/js/acq.js +++ b/koha-tt/intranet-tmpl/prog/en/js/acq.js @@ -384,7 +384,7 @@ function closeandprint(bg){ if(document.location = '/cgi-bin/koha/acqui/basketgroup.pl?op=closeandprint&basketgroupid=' + bg ){ setTimeout("window.location.reload();",3000); }else{ - alert('Error downloading the file'); + alert(_('Error downloading the file')); } } @@ -557,12 +557,14 @@ function getElementsByClass( searchClass, domNode, tagName) { function calcTotalRow(cell) { - var bud_id = cell.className; + var string = cell.name; + var pos = string.indexOf(",", 0); + var bud_id = string.substring(0, pos); var val1 = cell.value; - var remainingTotal = document.getElementById("budget_est_"+bud_id).textContent; + var remainingTotal = document.getElementById("budget_est_"+bud_id); var remainingNew =0; var budgetTotal = document.getElementById("budget_tot_"+bud_id ).textContent; - var arr = getElementsByClass(bud_id); + var arr = getElementsByClass(cell.className); budgetTotal = budgetTotal.replace(/\,/, ""); @@ -594,7 +596,7 @@ function calcTotalRow(cell) { function autoFillRow(bud_id) { - var remainingTotal = document.getElementById("budget_est_"+bud_id).textContent; + var remainingTotal = document.getElementById("budget_est_"+bud_id); var remainingNew = new Number; var budgetTotal = document.getElementById("budget_tot_"+bud_id ).textContent; var arr = getElementsByClass("plan_entry_" + bud_id); @@ -602,20 +604,25 @@ function autoFillRow(bud_id) { budgetTotal = budgetTotal.replace(/\,/, ""); var qty = new Number; // get the totals + var novalueArr = new Array(); for ( var i=0, len=arr.length; i082ab would look in 082 subfields a and b.)
Examples: Dewey: 082ab or 092ab; LOC: 050ab or 090ab; from the item record: 852hi" + - + - Display MARC subfield + - pref: AlternateHoldingsField + - "as holdings information for records that do not have items (This can contain multiple subfields to look in; for instance 852abhi would look in 852 subfields a, b, h, and i.), with the subfields separated by" + - pref: AlternateHoldingsSeparator + - "." - - Fill in the MARC organization code - pref: MARCOrgCode @@ -87,6 +94,12 @@ Cataloging: - Show - pref: URLLinkText - as the text of links embedded in MARC records. + - + - pref: UseControlNumber + choices: + yes: Use + no: "Don't use" + - record control number ($w subfields) and control number (001) for linking of bibliographic records. - - pref: hide_marc choices: diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 922e6a0bf2..9e74e4ab48 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -60,6 +60,12 @@ Circulation: - pref: numReturnedItemsToShow class: integer - last returned items on the checkin screen. + - + - pref: FineNotifyAtCheckin + choices: + yes: Notify + no: "Don't notify" + - librarians of overdue fines on the items they are checking in. - - pref: FilterBeforeOverdueReport choices: @@ -141,16 +147,6 @@ Circulation: choices: homebranch: the library the item is from. holdingbranch: the library the item was checked out from. - - - - Make all checkouts have a due date of - - pref: globalDueDate - class: date - - . - - - - Make all checkouts due on or before - - pref: ceilingDueDate - class: date - - . - - Calculate the due date using - pref: useDaysMode @@ -324,6 +320,28 @@ Circulation: yes: Enable no: "Don't enable" - "the web-based self checkout system. (available at: /cgi-bin/koha/sco/sco-main.pl)" + - + - Have patrons login into the web-based self checkout system with their + - pref: SelfCheckoutByLogin + choices: + yes: Username and Password + no: Barcode + - + - "Time out the current patron's web-based self checkout system login after" + - pref: SelfCheckTimeout + class: integer + - seconds. + - + - pref: AllowSelfCheckReturns + choices: + yes: Allow + no: "Don't allow" + - patrons to return items through web-based self checkout system. + - + - "Include the following HTML in the Help page of the web-based self checkout system:" + - pref: SelfCheckHelpMessage + type: textarea + class: code - - pref: AutoSelfCheckAllowed choices: diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 3014e6313d..9591f59a03 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -66,6 +66,12 @@ OPAC: yes: show no: "don't show" - icons for itemtype and authorized values. + - + - pref: COinSinOPACResults + choices: + yes: Include + no: "Don't include" + - "COinS / OpenURL / Z39.88 in OPAC search results.
Warning: Enabling this feature will slow OPAC search response times." - - pref: OPACDisplayRequestPriority choices: @@ -96,16 +102,21 @@ OPAC: - pref: opacsmallimage class: url - in the OPAC header, instead of the Koha logo. If this image is a different size than the Koha logo, you will need to customize the CSS. (This should be a complete URL, starting with http://.) + - + - Use the image at + - pref: OpacFavicon + class: url + - for the OPAC's favicon. (This should be a complete URL, starting with http://.) - - "Include the following JavaScript on all pages in the OPAC:" - pref: opacuserjs type: textarea class: code - - - Include the additional CSS stylesheet /css/ + - Include the additional CSS stylesheet - pref: opaccolorstylesheet class: file - - on all pages in the OPAC (leave blank to disable). + - to override specified settings from the default stylesheet. Enter the filename (if the file is in the server's css directory) or a complete URL beginning with http:// (if the file lives on a remote server). Leave blank to disable. - - Use the CSS stylesheet /css/ - pref: opaclayoutstylesheet @@ -147,6 +158,12 @@ OPAC: - pref: OPACSearchForTitleIn type: textarea class: code + - + - 'Include a "Links" column on the "my summary" tab when a user is logged in to the OPAC, with the following HTML (leave blank to disable):' + - '
Note: The placeholders {BIBLIONUMBER}, {TITLE}, {ISBN} and {AUTHOR} will be replaced with information from the displayed record.' + - pref: OPACMySummaryHTML + type: textarea + class: code - - pref: OpacAddMastheadLibraryPulldown choices: @@ -158,6 +175,15 @@ OPAC: - pref: OPACNoResultsFound type: textarea class: code + - + - 'Display the URI in the 856u field as an image on: ' + - pref: OPACDisplay856uAsImage + choices: + OFF: "Neither Details or Results pages" + Details: "Details page only" + Results: "Results page only" + Both: "Both Details and Results pages" + - 'Note: The corresponding OPACXSLT option must be turned on.' Features: - - pref: opacuserlogin @@ -219,6 +245,12 @@ OPAC: yes: Allow no: "Don't allow" - patrons to make comments on items on the OPAC. + - + - pref: ShowReviewer + choices: + yes: Show + no: Hide + - reviewer's name above comments in OPAC. - - pref: RequestOnOpac choices: @@ -274,6 +306,19 @@ OPAC: yes: Show no: "Don't show" - purchase suggestions from other patrons on the OPAC. + - + - pref: AllowPurchaseSuggestionBranchChoice + default: 0 + choices: + no: "Don't allow" + yes: Allow + - patrons to select branch when making a purchase suggestion + - + - pref: OpacHiddenItems + type: textarea + class: code + - Allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations. + Privacy: - - pref: AnonSuggestions diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref index 5ff267f6c7..b2b175c5b6 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -62,6 +62,13 @@ Searching: yes: Force no: "Don't force" - subject tracings in the OPAC and Staff Client to search only for complete-subfield matches. + - + - pref: TraceSubjectSubdivisions + default: 0 + choices: + yes: Include + no: "Don't include" + - subdivisions for searches generated by clicking on subject tracings. Search Form: - - Show checkboxes to search by @@ -98,6 +105,14 @@ Searching: dsc: descending. az: from A to Z. za: from Z to A. + - + - pref: displayFacetCount + type: boolean + default: no + choices: + yes: Show + no: "Don't show" + - facet counts. The relevance of these numbers highly depends on the value of the maxRecordsForFacets preference. Applies to OPAC and staff interface. - - By default, show - pref: numSearchResults @@ -128,6 +143,12 @@ Searching: - pref: maxItemsInSearchResults class: integer - items per biblio in the search results + - + - Build facets based on + - pref: maxRecordsForFacets + class: integer + default: 20 + - records from the search results. - - By default, show - pref: OPACnumSearchResults @@ -140,3 +161,8 @@ Searching: yes: Show no: "Don't show" - "an item's branch, location and call number in OPAC search results." + - + - Truncate facets length to + - pref: FacetLabelTruncationLength + class: integer + - characters, in OPAC/staff interface. diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index fc20c55f86..58db404558 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -1,4 +1,12 @@ Serials: + - + - Show + - pref: opacSerialDefaultTab + choices: + holdings: Holdings tab + subscriptions: Subscriptions tab + serialcollection: Serial Collection tab + - as default tab for serials in OPAC. Please note that the Serial Collection tab is currently available only for UNIMARC. - - pref: RenewSerialAddsSuggestion choices: @@ -33,4 +41,4 @@ Serials: choices: simplified: a summary full: a full list - - of the serial issues. \ No newline at end of file + - of the serial issues. diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref index 0d7fedcf7f..abde94a9c3 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref @@ -45,6 +45,11 @@ Staff Client: - pref: intranetuserjs type: textarea class: code + - + - Use the image at + - pref: IntranetFavicon + class: url + - for the Staff Client's favicon. (This should be a complete URL, starting with http://.) - - Show biblio records on result page in the staff client - pref: XSLTResultsDisplay @@ -63,6 +68,21 @@ Staff Client: choices: local: "included with Koha (faster, will work if internet goes down)." "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)." + - + - pref: StaffAuthorisedValueImages + choices: + yes: Show + no: "Don't show" + - images for authorized values (such as lost statuses and locations) in search results. + - + - 'Display the URI in the 856u field as an image on: ' + - pref: Display856uAsImage + choices: + OFF: "Neither Details or Results pages" + Details: "Details page only" + Results: "Results page (for future use, Results XSLT not functional at this time)." + Both: "Both Results and Details pages (for future use, Results XSLT not functional at this time)." + - 'Note: The corresponding XSLT option must be turned on.' Options: - - pref: viewMARC diff --git a/koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml b/koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml index c7a9e3ba44..e6cf2f55d7 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml +++ b/koha-tt/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_field_006.xml @@ -604,9 +604,9 @@ t u v - w + w y - z + z | diff --git a/koha-tt/opac-tmpl/prog/en/css/opac.css b/koha-tt/opac-tmpl/prog/en/css/opac.css index 83b54eaa4f..aa295c9ff4 100644 --- a/koha-tt/opac-tmpl/prog/en/css/opac.css +++ b/koha-tt/opac-tmpl/prog/en/css/opac.css @@ -9,7 +9,7 @@ a, a:visited { color : #006699; } -a:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover { +a:hover,#toolbar input.editshelf:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover { color : #990033; } @@ -1654,6 +1654,17 @@ span.starMT { * html #cartmenulink span, * html #listsmenulink span { padding-top : 5px; } + +#cartmenulink span#carticon { + background: transparent url("../../images/cart.gif") top left no-repeat; + position: static; + width : 14px; + height:14px; + margin: 0.35em 0.45em 0 0.2em; + padding:0; + float: left; +} + #listsmenulink { background : #9FBFFF; } -- 2.39.5